Changeset 11499 for code/branches/HUD_HS16/data/gui/scripts

Timestamp:

Oct 23, 2017, 2:56:00 PM (7 years ago)

Author:

patricwi

Message:

reset back in time

Location:

code/branches/HUD_HS16

Files:

• . (modified) (1 prop)
• data/gui/scripts/CampaignMenu.lua (modified) (3 diffs)
• data/gui/scripts/Dialogue.lua (deleted)
• data/gui/scripts/HighscoreMenu.lua (deleted)
• data/gui/scripts/MainMenu.lua (modified) (3 diffs)
• data/gui/scripts/MiscConfigMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• data/gui/scripts/TestDialogButttons.lua (deleted)

code/branches/HUD_HS16/data/gui/scripts/CampaignMenu.lua

@@ -9 +9 @@
 function P.updateButtons()
     P.updateButton(0, winMgr:getWindow("orxonox/Mission1Button"))
-    P.updateButton(0, winMgr:getWindow("orxonox/Mission1Text"))
     P.updateButton(1, winMgr:getWindow("orxonox/Mission2Button"))
-    P.updateButton(1, winMgr:getWindow("orxonox/Mission2Text"))
     P.updateButton(2, winMgr:getWindow("orxonox/Mission3Button"))
-    P.updateButton(2, winMgr:getWindow("orxonox/Mission3Text"))
     P.updateButton(3, winMgr:getWindow("orxonox/Mission4Button"))
-    P.updateButton(3, winMgr:getWindow("orxonox/Mission4Text"))
     P.updateButton(4, winMgr:getWindow("orxonox/Mission5Button"))
-    P.updateButton(4, winMgr:getWindow("orxonox/Mission5Text"))
     P.updateButton(5, winMgr:getWindow("orxonox/Mission6Button"))
-    P.updateButton(5, winMgr:getWindow("orxonox/Mission6Text"))
     P.updateButton(6, winMgr:getWindow("orxonox/Mission7Button"))
-    P.updateButton(6, winMgr:getWindow("orxonox/Mission7Text"))
     P.updateButton(7, winMgr:getWindow("orxonox/Mission8Button"))
-    P.updateButton(7, winMgr:getWindow("orxonox/Mission8Text"))
     P.updateButton(8, winMgr:getWindow("orxonox/Mission9Button"))
-    P.updateButton(8, winMgr:getWindow("orxonox/Mission9Text"))
 
 
@@ -106 +97 @@
 
 function P.loadLevel(level)
-    orxonox.execute("changeGame " .. level:getXMLFilename())
+    orxonox.execute("startGame " .. level:getXMLFilename())
     hideAllMenuSheets()
 end
@@ -127 +118 @@
 
 function P.CampaignMenuBackButton_clicked(e)
-    orxonox.execute("startMainMenu")
-    hideMenuSheet("CampaignMenu")
+    hideMenuSheet(P.name)
 end
 

code/branches/HUD_HS16/data/gui/scripts/MainMenu.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("MainMenu")
-P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "HighscoreMenu", "SettingsMenu", "CreditsMenu" }
+P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "SettingsMenu", "CreditsMenu" }
 
 function P.onLoad()
@@ -22 +22 @@
 
     P:setButton(4, 1, {
-            ["button"] = winMgr:getWindow("orxonox/HighscoreButton"),
-            ["callback"]  = P.MultiplayerButton_clicked
-    })
-
-    P:setButton(5, 1, {
             ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
             ["callback"]  = P.SettingsButton_clicked
     })
 
-    P:setButton(6, 1, {
+    P:setButton(5, 1, {
             ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
             ["callback"]  = P.CreditsButton_clicked
     })
 
-    P:setButton(7, 1, {
+    P:setButton(6, 1, {
             ["button"] = winMgr:getWindow("orxonox/ExitButton"),
             ["callback"]  = P.ExitButton_clicked
@@ -56 +51 @@
 end
 
-function P.HighscoreButton_clicked(e)
-    showMenuSheet("HighscoreMenu", true)
-end
-
 function P.SettingsButton_clicked(e)
     showMenuSheet("SettingsMenu", true)

code/branches/HUD_HS16/data/gui/scripts/MiscConfigMenu.lua

@@ -18 +18 @@
 
     P.commandList = {}
-    table.insert(P.commandList, "Highscore playerName_")
     table.insert(P.commandList, "KeyBinder mouseSensitivity_")
     table.insert(P.commandList, "KeyBinder mouseSensitivityDerived_")
@@ -44 +43 @@
 
     P.nameList = {}
-    table.insert(P.nameList, "Playername")
     table.insert(P.nameList, "Mouse sensitivity")
     table.insert(P.nameList, "Mouse acceleration")

code/branches/HUD_HS16/data/gui/scripts/SingleplayerMenu.lua

@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
-    -- showMenuSheet("CampaignMenu", true)
-    hideAllMenuSheets()
-    orxonox.execute("startGame StoryModeMap.oxw")
+    showMenuSheet("CampaignMenu", true)
 end