Changeset 7649 for code/branches/menu

Timestamp:

Nov 17, 2010, 3:56:50 PM (14 years ago)

Author:

dafrick

Message:

Restoring proper ESC functionality for InGameConsole.

Location:

code/branches/menu

Files:

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

code/branches/menu/data/gui/scripts/SheetManager.lua

@@ -5 +5 @@
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
+local bInGameConsoleClosed = false
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
 
@@ -201 +202 @@
     -- HUGE, very HUGE hacks!
 
+    -- If the InGameConsole is active, ignore the ESC command.
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = falses
+        return
+    end
+
     -- Count the number of sheets that don't need input till the first that does.
     local counter = noInputSheetCounter()
@@ -235 +242 @@
 end
 
+function inGameConsoleClosed()
+    bInGameConsoleClosed = not bInGameConsoleClosed;
+end
+
 ----------------------
 --- Initialisation ---

code/branches/menu/src/orxonox/overlays/InGameConsole.cc

@@ -49 +49 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
 #include "core/input/InputBuffer.h"
+#include "core/LuaState.h"
 
 namespace orxonox
@@ -495 +497 @@
                 }
                 else
-                  this->inputWindowStart_ = 0;
+                    this->inputWindowStart_ = 0;
                 this->displayedText_ = output;
                 this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::DisplayString>(output));
@@ -532 +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);
@@ -608 +611 @@
     /*static*/ void InGameConsole::closeConsole()
     {
+        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
         InGameConsole::getInstance().deactivate();
     }
+
 }