Changeset 11052 for code/trunk/data/gui/scripts

Timestamp:

Jan 9, 2016, 6:26:20 PM (9 years ago)

Author:

landauf

Message:

merged branch presentationHS15 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/scripts/CampaignMenu.lua (modified) (2 diffs)
• data/gui/scripts/InGameMenu.lua (modified) (3 diffs)
• data/gui/scripts/SheetManager.lua (modified) (1 diff)

code/trunk/data/gui/scripts/CampaignMenu.lua

@@ -8 +8 @@
 
 function P.updateButtons()
-    P.updateButton(0, winMgr:getWindow("orxonox/MissionOneButton"))
-    P.updateButton(1, winMgr:getWindow("orxonox/MissionTwoButton"))
-    P.updateButton(2, winMgr:getWindow("orxonox/MissionThreeButton"))
-    P.updateButton(3, winMgr:getWindow("orxonox/MissionFourButton"))
+    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
+    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
+    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
+    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
+    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
+    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
+    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
+    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
+    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
+
 
     if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
@@ -54 +60 @@
 end
 
-function P.MissionOneButton_clicked(e)
+function P.Mission1Button_clicked(e)
     P.loadLevel(P.FindLevel(0))
 end
 
-function P.MissionTwoButton_clicked(e)
+function P.Mission2Button_clicked(e)
     P.loadLevel(P.FindLevel(1))
 end
 
-function P.MissionThreeButton_clicked(e)
+function P.Mission3Button_clicked(e)
     P.loadLevel(P.FindLevel(2))
 end
 
-function P.MissionFourButton_clicked(e)
+function P.Mission4Button_clicked(e)
     P.loadLevel(P.FindLevel(3))
+end
+
+function P.Mission5Button_clicked(e)
+    P.loadLevel(P.FindLevel(4))
+end
+
+function P.Mission6Button_clicked(e)
+    P.loadLevel(P.FindLevel(5))
+end
+
+function P.Mission7Button_clicked(e)
+    P.loadLevel(P.FindLevel(6))
+end
+
+function P.Mission8Button_clicked(e)
+    P.loadLevel(P.FindLevel(7))
+end
+
+function P.Mission9Button_clicked(e)
+    P.loadLevel(P.FindLevel(8))
 end
 

code/trunk/data/gui/scripts/InGameMenu.lua

@@ -7 +7 @@
     P.multiplayerMode = "startClient"
 
-    --button are arranged in a 4x1 matrix, the left lower item is nil
+    --button are arranged in a 5x1 matrix, the left lower item is nil
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/InGameMenu_ReturnButton"),
@@ -14 +14 @@
 
     P:setButton(2, 1, {
+            ["button"] = winMgr:getWindow("orxonox/InGameMenu_ReloadLevelButton"),
+            ["callback"]  = P.button_reloadLevel_clicked
+    })
+
+    P:setButton(3, 1, {
             ["button"] = winMgr:getWindow("orxonox/InGameMenu_MainMenuButton"),
             ["callback"]  = P.button_mainmenu_clicked
     })
 
-    P:setButton(3, 1, {
+    P:setButton(4, 1, {
             ["button"] = winMgr:getWindow("orxonox/InGameMenu_SettingsButton"),
             ["callback"]  = P.button_settings_clicked
     })
 
-    P:setButton(4, 1, {
+    P:setButton(5, 1, {
             ["button"] = winMgr:getWindow("orxonox/InGameMenu_QuitButton"),
             ["callback"]  = P.button_quit_clicked
@@ -54 +59 @@
 end
 
+function P.button_reloadLevel_clicked(e)
+    hideMenuSheet("InGameMenu")
+    orxonox.execute("reloadLevel")
+end
+
 function P.button_return_clicked(e)
     hideMenuSheet("InGameMenu")

code/trunk/data/gui/scripts/SheetManager.lua

@@ -24 +24 @@
         cursor:show()
     end
+end
+
+function getLoadedSheets()
+    local names = ""
+    for name, sheet in pairs(loadedSheets) do
+        names = names .. name
+        names = names .. ","
+    end
+    return names
 end