- Timestamp:
- May 14, 2011, 5:30:26 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/data/gui/scripts/SheetManager.lua
r8482 r8484 5 5 local activeMenuSheets = {size = 0, topSheetTuple = nil} 6 6 local menuSheetsRoot = guiMgr:getMenuRootWindow() 7 local bInGameConsoleClosed = false 7 8 local mainMenuLoaded = false 8 9 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed") … … 218 219 -- Count the number of sheets that don't need input till the first that does. 219 220 local counter = noInputSheetIndex() 221 222 -- If the InGameConsole is active, ignore the ESC command. 223 if bInGameConsoleClosed == true then 224 bInGameConsoleClosed = false 225 if counter > 0 then 226 return 227 end 228 end 220 229 221 230 -- If the first sheet that needs input is the MainMenu. … … 288 297 end 289 298 299 function inGameConsoleClosed() 300 bInGameConsoleClosed = not bInGameConsoleClosed; 301 end 302 290 303 function getGUIFirstActive(name, bHidePrevious, bNoInput) 291 304 local sheet = activeMenuSheets.topSheetTuple -
code/trunk/src/orxonox/overlays/InGameConsole.cc
r8482 r8484 534 534 { 535 535 this->bActive_ = false; 536 GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed. 536 537 InputManager::getInstance().leaveState("console"); 537 538 this->shell_->unregisterListener(this);
Note: See TracChangeset
for help on using the changeset viewer.