[Orxonox-commit 3804] r8482 - in code/trunk: data/gui/scripts src/orxonox/overlays

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-14 10:25:10 +0200 (Sat, 14 May 2011)
New Revision: 8482

Modified:
   code/trunk/data/gui/scripts/SheetManager.lua
   code/trunk/src/orxonox/overlays/InGameConsole.cc
Log:
Fixing minor bug. When the InGameConsole was closed you would need to push ESC two times to get into the InGameMenu.


Modified: code/trunk/data/gui/scripts/SheetManager.lua
===================================================================
--- code/trunk/data/gui/scripts/SheetManager.lua	2011-05-14 08:01:24 UTC (rev 8481)
+++ code/trunk/data/gui/scripts/SheetManager.lua	2011-05-14 08:25:10 UTC (rev 8482)
@@ -4,7 +4,6 @@
 local loadedSheets = {}
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
-local bInGameConsoleClosed = false
 local mainMenuLoaded = false
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "Sized", "windowResized")
@@ -216,12 +215,6 @@
 function keyESC()
     -- 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()
 
@@ -294,10 +287,6 @@
     return counter
 end
 
-function inGameConsoleClosed()
-    bInGameConsoleClosed = not bInGameConsoleClosed;
-end
-
 function getGUIFirstActive(name, bHidePrevious, bNoInput)
     local sheet = activeMenuSheets.topSheetTuple
     -- If the topmost gui sheet has the input name

Modified: code/trunk/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/trunk/src/orxonox/overlays/InGameConsole.cc	2011-05-14 08:01:24 UTC (rev 8481)
+++ code/trunk/src/orxonox/overlays/InGameConsole.cc	2011-05-14 08:25:10 UTC (rev 8482)
@@ -533,7 +533,6 @@
         if (this->bActive_)
         {
             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);