Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 2, 2009, 8:41:44 PM (15 years ago)
Author:
scheusso
Message:

a small fix in IOConsole
some changes in GUI-system and preparation for keybindings menu
fix in menu handling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

    r6199 r6214  
    5555function showGUI(filename, hidePrevious, bCursorVisible)
    5656    if bCursorVisible == nil then
    57         bCursorVisible = true
     57        if nrOfActiveSheets > 0 then
     58            bCursorVisible = cursorVisibility[nrOfActiveSheets]
     59        else
     60            bCursorVisible = true
     61        end
    5862    end
    5963
     
    170174
    171175function keyESC()
    172     if nrOfActiveSheets > 0 then
     176    if nrOfActiveSheets == 1 and activeSheets[1] == "MainMenu" then
     177        orxonox.CommandExecutor:execute("exit")
     178    elseif nrOfActiveSheets > 0 then
    173179        orxonox.CommandExecutor:execute("hideGUI "..activeSheets[nrOfActiveSheets])
    174180    else
Note: See TracChangeset for help on using the changeset viewer.