Changeset 8484 for code/trunk

Timestamp:

May 14, 2011, 5:30:26 PM (14 years ago)

Author:

dafrick

Message:

Turns out my pervious fix actually induced a bug, this fix should take care of both problems.

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")
@@ -218 +219 @@
     -- Count the number of sheets that don't need input till the first that does.
     local counter = noInputSheetIndex()
+    
+    -- If the InGameConsole is active, ignore the ESC command.
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = false
+        if counter > 0 then
+            return
+        end
+    end
 
     -- If the first sheet that needs input is the MainMenu.
@@ -288 +297 @@
 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);