Changeset 9046

Timestamp:

Mar 17, 2012, 7:19:14 PM (12 years ago)

Author:

huttemat

Message:

test

Location:

code/branches/shipSelection/data

Files:

• gui/scripts/ShipSelectionMenu.lua (modified) (3 diffs)
• gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• levels/tutorial.oxw (modified) (1 diff)

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

@@ -2 +2 @@
 
 local P = createMenuSheet("ShipSelectionMenu")
-P.levelList = {}
+level = nil
 P.activeTabIndexes = {}
 P.scrollbarWidth = 13
-
+function P.loadShips(levelname)
+    --orxonox.execute("echo " .. levelname)
+    --level = levelname
+end
 function P.onLoad()
 --[[    P.createLevelList()
@@ -140 +143 @@
 --]]
 function P.ShipSelectionStartButton_clicked(e)
---[[
-    local level = P.ShipSelectionGetSelectedLevel()
-    if level ~= nil then
 
-        if level:hasTag("shipselection") then
-            orxout("working!")
-            showMenuSheet("ShipSelectionMenu", true)
-        else
-            orxonox.execute("startGame " .. level:getXMLFilename())
-            hideAllMenuSheets()
-        end
+    if P.level ~= nil then
+        orxonox.execute("startGame " .. level:getXMLFilename())
+        hideAllMenuSheets()
+    else
+        orxonox.execute("keyESC")
     end
---]]
 end
 
@@ -166 +163 @@
 
 function P.ShipSelectionBackButton_clicked(e)
-    --hideMenuSheet(P.name)
+    orxonox.execute("keyESC")
 end 
 

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

@@ -145 +145 @@
 
         if level:hasTag("shipselection") then
-            showMenuSheet("ShipSelectionMenu", true)
+            local shipSelectionMenu = showMenuSheet("ShipSelectionMenu", true)
+            shipSelectionMenu:loadShips(level:getXMLFilename())
         else
             orxonox.execute("startGame " .. level:getXMLFilename())

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

@@ -53 +53 @@
       for i = 1, 10, 1 do
     ?>
-      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=shipselection />
     <?lua end ?>