Changeset 8482 for code/trunk
- Timestamp:
- May 14, 2011, 10:25:10 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/data/gui/scripts/SheetManager.lua
r8079 r8482 5 5 local activeMenuSheets = {size = 0, topSheetTuple = nil} 6 6 local menuSheetsRoot = guiMgr:getMenuRootWindow() 7 local bInGameConsoleClosed = false8 7 local mainMenuLoaded = false 9 8 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed") … … 217 216 -- HUGE, very HUGE hacks! 218 217 219 -- If the InGameConsole is active, ignore the ESC command.220 if bInGameConsoleClosed == true then221 bInGameConsoleClosed = false222 return223 end224 225 218 -- Count the number of sheets that don't need input till the first that does. 226 219 local counter = noInputSheetIndex() … … 295 288 end 296 289 297 function inGameConsoleClosed()298 bInGameConsoleClosed = not bInGameConsoleClosed;299 end300 301 290 function getGUIFirstActive(name, bHidePrevious, bNoInput) 302 291 local sheet = activeMenuSheets.topSheetTuple -
code/trunk/src/orxonox/overlays/InGameConsole.cc
r8079 r8482 534 534 { 535 535 this->bActive_ = false; 536 GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.537 536 InputManager::getInstance().leaveState("console"); 538 537 this->shell_->unregisterListener(this);
Note: See TracChangeset
for help on using the changeset viewer.