Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8482


Ignore:
Timestamp:
May 14, 2011, 10:25:10 AM (13 years ago)
Author:
dafrick
Message:

Fixing minor bug. When the InGameConsole was closed you would need to push ESC two times to get into the InGameMenu.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/data/gui/scripts/SheetManager.lua

    r8079 r8482  
    55local activeMenuSheets = {size = 0, topSheetTuple = nil}
    66local menuSheetsRoot = guiMgr:getMenuRootWindow()
    7 local bInGameConsoleClosed = false
    87local mainMenuLoaded = false
    98orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
     
    217216    -- HUGE, very HUGE hacks!
    218217
    219     -- If the InGameConsole is active, ignore the ESC command.
    220     if bInGameConsoleClosed == true then
    221         bInGameConsoleClosed = false
    222         return
    223     end
    224 
    225218    -- Count the number of sheets that don't need input till the first that does.
    226219    local counter = noInputSheetIndex()
     
    295288end
    296289
    297 function inGameConsoleClosed()
    298     bInGameConsoleClosed = not bInGameConsoleClosed;
    299 end
    300 
    301290function getGUIFirstActive(name, bHidePrevious, bNoInput)
    302291    local sheet = activeMenuSheets.topSheetTuple
  • code/trunk/src/orxonox/overlays/InGameConsole.cc

    r8079 r8482  
    534534        {
    535535            this->bActive_ = false;
    536             GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.
    537536            InputManager::getInstance().leaveState("console");
    538537            this->shell_->unregisterListener(this);
Note: See TracChangeset for help on using the changeset viewer.