Changeset 6214 for code/branches/presentation2/data

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:

• code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua (modified) (2 diffs)

code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

@@ -55 +55 @@
 function showGUI(filename, hidePrevious, bCursorVisible)
     if bCursorVisible == nil then
-        bCursorVisible = true
+        if nrOfActiveSheets > 0 then
+            bCursorVisible = cursorVisibility[nrOfActiveSheets]
+        else
+            bCursorVisible = true
+        end
     end
 
@@ -170 +174 @@
 
 function keyESC()
-    if nrOfActiveSheets > 0 then
+    if nrOfActiveSheets == 1 and activeSheets[1] == "MainMenu" then
+        orxonox.CommandExecutor:execute("exit")
+    elseif nrOfActiveSheets > 0 then
         orxonox.CommandExecutor:execute("hideGUI "..activeSheets[nrOfActiveSheets])
     else