Changeset 6048 for code/branches/menu/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Nov 12, 2009, 11:32:41 AM (15 years ago)

Author:

scheusso

Message:

ESC handling in ingame menu: if theres already an opened GUI sheet then hide it, if not open the ingame menu
in mainmenu everything should remain the same

File:

• code/branches/menu/src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

code/branches/menu/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::showGUI("inGameTest");
-        }
-        else
-        {
-            GUIManager::hideGUI("inGameTest");
         }
     }