# HG changeset patch # User smxx # Date 1265836983 0 # Node ID d48bbe4518e6554a480b08f8e5955300266d3092 # Parent 98b990feec7dec20b4b34aa3cd34434f75517ad1 Engine: * Excluded Lua scripting on iPhone Frontend: * Some stylesheet tweaks by Tiy and me diff -r 98b990feec7d -r d48bbe4518e6 QTfrontend/main.cpp --- a/QTfrontend/main.cpp Wed Feb 10 17:53:21 2010 +0000 +++ b/QTfrontend/main.cpp Wed Feb 10 21:23:03 2010 +0000 @@ -94,11 +94,13 @@ "* {" "color: #ffcc00;" + "selection-background-color: #ffcc00;" + "selection-color: #00351d;" "}" "QLineEdit, QListWidget, QTableView, QTextBrowser, QSpinBox, QComboBox, " "QComboBox QAbstractItemView, QMenu::item {" - "background-color: #0d0544;" + "background-color: rgba(13, 5, 68, 70%);" "}" "QPushButton, QListWidget, QTableView, QLineEdit, QHeaderView, " @@ -128,17 +130,15 @@ "font: bold 14px;" "}" "SelWeaponWidget QTabWidget::pane, SelWeaponWidget QTabBar::tab:selected {" - "background-image: url(\":/res/panelbg.png\");" "background-position: bottom center;" "background-repeat: repeat-x;" - "background-color: #040200;" + "background-color: #000000;" "}" ".QGroupBox,GameCFGWidget,TeamSelWidget,SelWeaponWidget {" - "background-image: url(\":/res/panelbg.png\");" "background-position: bottom center;" "background-repeat: repeat-x;" "border-radius: 16px;" - "background-color: #040200;" + "background-color: rgba(13, 5, 68, 70%);" "padding: 6px;" "}" /* Experimenting with PaintOnScreen and border-radius on IconedGroupBox children didn't work out well @@ -156,7 +156,7 @@ "border-radius: 10px;" "background-origin: margin;" "background-position: top left;" - "background-color: #00351d;" + "background-color: rgba(18, 42, 5, 70%);" "}" "QPushButton:pressed{" @@ -220,7 +220,6 @@ "}" "VertScrArea {" - "background-image: url(\":/res/panelbg.png\");" "background-position: bottom center;" "background-repeat: repeat-x;" "}" @@ -363,4 +362,4 @@ Form->show(); return app.exec(); -} +} \ No newline at end of file diff -r 98b990feec7d -r d48bbe4518e6 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Wed Feb 10 17:53:21 2010 +0000 +++ b/hedgewars/CMakeLists.txt Wed Feb 10 21:23:03 2010 +0000 @@ -5,7 +5,8 @@ find_package(SDL_net) find_package(SDL_ttf) find_package(SDL_mixer) -find_package(Lua51 REQUIRED) +#TODO: exclude for iphone only? +find_package(Lua51) #find which version of SDL_image and SDL_mixer we have (for IMG_Init and Mix_Init) #if the headers are not installed, the newer apis won't be activated diff -r 98b990feec7d -r d48bbe4518e6 hedgewars/uScript.pas --- a/hedgewars/uScript.pas Wed Feb 10 17:53:21 2010 +0000 +++ b/hedgewars/uScript.pas Wed Feb 10 21:23:03 2010 +0000 @@ -37,6 +37,7 @@ procedure free_uScript; implementation +{$IFNDEF IPHONEOS} uses LuaPas in 'LuaPas.pas', uConsole, uMisc, @@ -49,7 +50,7 @@ uTeams, uKeys, typinfo; - + var luaState : Plua_State; ScriptAmmoStore : string; ScriptLoaded : boolean; @@ -525,4 +526,39 @@ lua_close(luaState); end; +{$ELSE} +procedure ScriptPrintStack; +begin +end; + +procedure ScriptClearStack; +begin +end; + +procedure ScriptLoad(name : string); +begin +end; + +procedure ScriptOnGameInit; +begin +end; + +procedure ScriptCall(fname : string); +begin +end; + +function ScriptCall(fname : string; par1, par2, par3, par4 : LongInt) : LongInt; +begin +ScriptCall:= nil +end; + +procedure init_uScript; +begin +end; + +procedure free_uScript; +begin +end; + +{$ENDIF} end.