Changeset 2887 for code/branches/gui/src/orxonox/gamestates

Timestamp:

Apr 2, 2009, 5:03:16 PM (16 years ago)

Author:

bknecht

Message:

first part of finishing up to merge back. solving some issues I ran into with Lua

Location:

code/branches/gui/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (2 diffs)
• GSMainMenu.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/gamestates/GSLevel.cc

@@ -133 +133 @@
             InputManager::getInstance().setKeyDetectorCallback(std::string("keybind ") + keyDetectorCallbackCode_);
 
-            // InGame GUI test
-            GUIManager::getInstance().showGUI("inGameTest");
-
             // level is loaded: we can start capturing the input
             InputManager::getInstance().requestEnterState("game");
@@ -143 +140 @@
     void GSLevel::showIngameGUI(bool show)
     {
-        COUT(0) << "*** Call works with \"" << (show ? "true" : "false") << "\" as param" << std::endl;
         if (show)
         {
             GUIManager::getInstancePtr()->showGUI("inGameTest");
+            GUIManager::getInstancePtr()->executeCode("showCursor()");
             InputManager::getInstance().requestEnterState("guiMouseOnly");
         }
         else
         {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(inGameTest)");
+            GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
+            GUIManager::getInstancePtr()->executeCode("hideCursor()");
             InputManager::getInstance().requestLeaveState("guiMouseOnly");
         }

code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc

@@ -86 +86 @@
         InputManager::getInstance().requestDestroyState("mainMenu");
 
+/*
         if (this->ccStartGame_)
         {
@@ -91 +92 @@
             this->ccStartGame_ = 0;
         }
+*/
     }