Changeset 8482

Timestamp:

May 14, 2011, 10:25:10 AM (14 years ago)

Author:

dafrick

Message:

Fixing minor bug. When the InGameConsole was closed you would need to push ESC two times to get into the InGameMenu.

Location:

code/trunk

Files:

• data/gui/scripts/SheetManager.lua (modified) (3 diffs)
• src/orxonox/overlays/InGameConsole.cc (modified) (1 diff)

code/trunk/data/gui/scripts/SheetManager.lua

@@ -5 +5 @@
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
-local bInGameConsoleClosed = false
 local mainMenuLoaded = false
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
@@ -217 +216 @@
     -- HUGE, very HUGE hacks!
 
-    -- If the InGameConsole is active, ignore the ESC command.
-    if bInGameConsoleClosed == true then
-        bInGameConsoleClosed = false
-        return
-    end
-
     -- Count the number of sheets that don't need input till the first that does.
     local counter = noInputSheetIndex()
@@ -295 +288 @@
 end
 
-function inGameConsoleClosed()
-    bInGameConsoleClosed = not bInGameConsoleClosed;
-end
-
 function getGUIFirstActive(name, bHidePrevious, bNoInput)
     local sheet = activeMenuSheets.topSheetTuple

code/trunk/src/orxonox/overlays/InGameConsole.cc

@@ -534 +534 @@
         {
             this->bActive_ = false;
-            GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.
             InputManager::getInstance().leaveState("console");
             this->shell_->unregisterListener(this);