[Orxonox-commit 162] r2841 - branches/gui/src/orxonox/gui

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-25 14:17:38 +0000 (Wed, 25 Mar 2009)
New Revision: 2841

Modified:
   branches/gui/src/orxonox/gui/GUIManager.cc
Log:
Using loadGUI_2.lua in this branch now.

Modified: branches/gui/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/gui/src/orxonox/gui/GUIManager.cc	2009-03-25 10:15:28 UTC (rev 2840)
+++ branches/gui/src/orxonox/gui/GUIManager.cc	2009-03-25 14:17:38 UTC (rev 2841)
@@ -204,7 +204,7 @@
                 tolua_Core_open(this->scriptModule_->getLuaState());
                 tolua_Orxonox_open(this->scriptModule_->getLuaState());
                 */
-                this->scriptModule_->executeScriptFile("loadGUI.lua", "GUI");
+                this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
             }
             catch (CEGUI::Exception& ex)
             {
@@ -248,7 +248,7 @@
         // TODO: create something 3D
         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");
         }