Changeset 6743 for code/branches/gamestates2/data

Timestamp:

Apr 16, 2010, 1:07:57 PM (14 years ago)

Author:

rgrieder

Message:

• Bugfix in keyESC.
• Default behaviour for GUI sheet InputStates is now not to handle keyboard input —> KeyBinder is used.
• Added some temporary hackery to GSMainMenu to enable the use of Keys in the MainMenu.

Location:

code/branches/gamestates2/data/gui/scripts

Files:

• MenuSheet.lua (modified) (1 diff)
• SheetManager.lua (modified) (1 diff)

code/branches/gamestates2/data/gui/scripts/MenuSheet.lua

@@ -16 +16 @@
     newSheet.bHidePrevious  = handleDefArg(_bHidePrevious,  true)
     newSheet.tShowCursor    = handleDefArg(_tShowCusor,     TriBool.True)
-    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.True)
+    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.Dontcare)
     newSheet.bBlockJoyStick = handleDefArg(_bBlockJoyStick, false)
 

code/branches/gamestates2/data/gui/scripts/SheetManager.lua

@@ -181 +181 @@
         orxonox.execute("exit")
     elseif activeMenuSheets.size > 0 then
-        orxonox.execute("hideMenuSheet "..activeMenuSheets.topSheetTuple.sheet.name)
+        orxonox.execute("hideGUI "..activeMenuSheets.topSheetTuple.sheet.name)
     else
         showMenuSheet("InGameMenu")