Changeset 9039 for code/branches

Timestamp:

Mar 16, 2012, 3:33:05 PM (13 years ago)

Author:

huttemat

Message:

Added ShipSelectionMenu.layout

Location:

code/branches/shipSelection/data

Files:

• gui/layouts/ShipSelectionMenu.layout (added)
• gui/scripts/SingleplayerMenu.lua (modified) (2 diffs)
• levels/tutorial.oxw (modified) (1 diff)

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

@@ -2 +2 @@
 
 local P = createMenuSheet("SingleplayerMenu")
-
+P.loadAlong = { "ShipSelectionMenu"}
 P.levelList = {}
 P.activeTabIndexes = {}
@@ -143 +143 @@
     local level = P.SingleplayerGetSelectedLevel()
     if level ~= nil then
+        if level:hasTag("shipselection") then
+            showMenuSheet("ShipSelectionMenu", true)
+        end
         orxonox.execute("startGame " .. level:getXMLFilename())
         hideAllMenuSheets()

code/branches/shipSelection/data/levels/tutorial.oxw

@@ -2 +2 @@
  name = "Coding Tutorial"
  description = "Level for the coding tutorial."
- tags = "tutorial"
+ tags = "tutorial, shipselection"
  screenshot = "codingtutorial.png"
 />