Changeset 8015 for code/branches/tutorial/src

Timestamp:

Mar 3, 2011, 4:33:13 PM (14 years ago)

Author:

rgrieder

Message:

Fixed bug occurred during bugfix (new bug is worse) by merging r8013 of the usability branch.

Location:

code/branches/tutorial

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/InGameConsole.cc (modified) (2 diffs)

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

@@ -513 +513 @@
             this->bActive_ = true;
             InputManager::getInstance().enterState("console");
-            GUIManager::getInstance().getLuaState()->doString("inGameConsoleOpened()"); // Notify the SheetManager in lua, that the console has been closed.
             this->shell_->registerListener(this);
 
@@ -612 +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();
     }