Changeset 6150 for code/branches/presentation2/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Nov 25, 2009, 4:52:37 PM (15 years ago)

Author:

scheusso

Message:

merged menu branch to presentation2 branch with some additional fixes and features

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

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

@@ -56 +56 @@
         , guiKeysOnlyInputState_(0)
         , startFile_(0)
+        , bShowIngameGUI_(false)
     {
     }
@@ -78 +79 @@
             guiKeysOnlyInputState_ = InputManager::getInstance().createInputState("guiKeysOnly");
             guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
-
-            CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSLevel::showIngameGUI, this), "showIngameGUI"));
         }
 
@@ -94 +93 @@
             // connect the HumanPlayer to the game
             PlayerManager::getInstance().clientConnected(0);
-        }
-    }
-
-    void GSLevel::showIngameGUI(bool show)
-    {
-        if (show)
-        {
-            GUIManager::getInstance().showGUI("inGameTest");
-            GUIManager::getInstance().executeCode("showCursor()");
-            InputManager::getInstance().enterState("guiMouseOnly");
-        }
-        else
-        {
-            GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
-            GUIManager::getInstance().executeCode("hideCursor()");
-            InputManager::getInstance().leaveState("guiMouseOnly");
         }
     }