Changeset 2841

Timestamp:

Mar 25, 2009, 3:17:38 PM (16 years ago)

Author:

rgrieder

Message:

Using loadGUI_2.lua in this branch now.

File:

• code/branches/gui/src/orxonox/gui/GUIManager.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -205 +205 @@
                 tolua_Orxonox_open(this->scriptModule_->getLuaState());
                 */
-                this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
+                this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
             }
             catch (CEGUI::Exception& ex)
@@ -249 +249 @@
         try
         {
-            this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
+            this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
             lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
             lua_setglobal(this->scriptModule_->getLuaState(), "datapath");