Changeset 6019 for code/branches/ingamemenu/data

Timestamp:

Nov 3, 2009, 11:53:47 AM (15 years ago)

Author:

scheusso

Message:

Added return to Game button to InGameMenu
MainMenu button now requests mainmenu gamestate

Location:

code/branches/ingamemenu/data/gui

Files:

• layouts/InGameMenu.layout (modified) (2 diffs)
• scripts/InGameMenu.lua (modified) (1 diff)

code/branches/ingamemenu/data/gui/layouts/InGameMenu.layout

@@ -10 +10 @@
             <Property Name="Text" Value="MainMenu" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.2,0},{0.45,0},{0.4,0},{0.55,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.2,0},{0.6,0},{0.3,0}}" />
             <Property Name="Alpha" Value="0.7" />
             <Event Name="Clicked" Function="InGameMenu.button_mainmenu_clicked"/>
@@ -18 +18 @@
             <Property Name="Text" Value="Quit" />
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="UnifiedAreaRect" Value="{{0.6,0},{0.45,0},{0.8,0},{0.55,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.4,0},{0.6,0},{0.5,0}}" />
             <Property Name="Alpha" Value="0.7" />
             <Event Name="Clicked" Function="InGameMenu.button_quit_clicked"/>
         </Window>
+        <Window Type="TaharezLook/Button" Name="orxonox/InGameMenu_ReturnButton" >
+            <Property Name="Font" Value="BlueHighway-12" />
+            <Property Name="Text" Value="return to Game" />
+            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+            <Property Name="UnifiedAreaRect" Value="{{0.4,0},{0.6,0},{0.6,0},{0.7,0}}" />
+            <Property Name="Alpha" Value="0.7" />
+            <Event Name="Clicked" Function="InGameMenu.button_return_clicked"/>
+        </Window>
     </Window>
 </GUILayout>

code/branches/ingamemenu/data/gui/scripts/InGameMenu.lua

@@ -23 +23 @@
 
 function P.button_mainmenu_clicked(e)
+    orxonox.Game:getInstance():popState()
+    orxonox.Game:getInstance():popState()
+    orxonox.Game:getInstance():requestState("mainmenu")
     orxonox.CommandExecutor:execute("showGUI MainMenu")
+    orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+end
+
+function P.button_return_clicked(e)
     orxonox.CommandExecutor:execute("hideGUI InGameMenu")
 end