Changeset 10255 for code/branches/presentationHS14merge/data/gui/scripts

Timestamp:

Feb 4, 2015, 10:21:28 PM (10 years ago)

Author:

landauf

Message:

merged storymodeHS14

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• data/gui/scripts/CampaignMenu.lua (copied) (copied from code/branches/storymodeHS14/data/gui/scripts/CampaignMenu.lua)
• data/gui/scripts/SingleplayerMenu.lua (modified) (4 diffs)

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

@@ -2 +2 @@
 
 local P = createMenuSheet("SingleplayerMenu")
-P.loadAlong = {"ShipSelectionMenu"}
+P.loadAlong = {"ShipSelectionMenu","CampaignMenu"}
 P.levelList = {}
 P.activeTabIndexes = {}
@@ -23 +23 @@
     P.SingleplayerSelectionChanged()
 
-    --buttons are arranged in a 1x3 matrix
+    --buttons are arranged in a 2x3 matrix
     P:setButton(1, 1, {
             ["button"] = winMgr:getWindow("orxonox/SingleplayerStartButton"),
@@ -37 +37 @@
             ["button"] = winMgr:getWindow("orxonox/SingleplayerBackButton"),
             ["callback"]  = P.SingleplayerBackButton_clicked
+    })
+
+    P:setButton(2, 2,{
+            ["button"] = winMgr:getWindow("orxonox/CampaignButton"),
+            ["callback"] = P.CampaignButton_clicked
     })
 end
@@ -166 +171 @@
 end
 
+function P.CampaignButton_clicked(e)
+    showMenuSheet("CampaignMenu", true)
+end
+
 return P