Changeset 2957 for code/trunk/src/orxonox

Timestamp:

May 7, 2009, 5:05:45 PM (16 years ago)

Author:

bknecht

Message:

hack to include gui into hud

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSMainMenu.cc (modified) (1 diff)
• gui/GUIManager.cc (modified) (1 diff)
• overlays/CMakeLists.txt (modified) (1 diff)
• overlays/GUIOverlay.cc (added)
• overlays/GUIOverlay.h (added)

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -67 +67 @@
 
         // show main menu
-        GUIManager::getInstance().showGUI("mainmenu");
+        GUIManager::getInstance().showGUI("mainmenu_2");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);

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

@@ -187 +187 @@
         try
         {
-            // call main Lua script
-            this->scriptModule_->executeScriptFile("loadGUI_2.lua", "GUI");
             // set datapath for GUI data
             lua_pushfstring(this->scriptModule_->getLuaState(), Core::getMediaPathString().c_str());
             lua_setglobal(this->scriptModule_->getLuaState(), "datapath");
+            // call main Lua script
+            this->scriptModule_->executeScriptFile("loadGUI_3.lua", "GUI");
         }
         catch (CEGUI::Exception& ex)

code/trunk/src/orxonox/overlays/CMakeLists.txt

@@ -3 +3 @@
   OverlayGroup.cc
   OverlayText.cc
+  GUIOverlay.cc
 )