Changeset 9057 for code/branches/shipSelection/data/gui

Timestamp:

Mar 23, 2012, 4:24:24 PM (13 years ago)

Author:

huttemat

Message:

test2

Location:

code/branches/shipSelection/data/gui/scripts

Files:

• ShipSelectionMenu.lua (modified) (3 diffs)
• SingleplayerMenu.lua (modified) (2 diffs)

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

@@ -2 +2 @@
 
 local P = createMenuSheet("ShipSelectionMenu")
-level = nil
 P.activeTabIndexes = {}
 P.scrollbarWidth = 13
-function P.loadShips(levelname)
-    --orxonox.execute("echo " .. levelname)
-    --level = levelname
-end
+
 function P.onLoad()
---[[    P.createLevelList()
-    
+   orxonox.execute("orxout internal_warning Ships= " .. selectedlevel.getShips())
+   P.createLevelList(selectedlevel)
+--[[     
     -- create tabs with desired tab as argument (nil for all)
     P.createFilterTab("Gametypes", "gametype")
@@ -40 +37 @@
     })--]]
 end
---[[
-function P.createLevelList()
-    P.levelList = {}
+
+function P.createShipList(level)
+
+    orxonox.execute("orxout internal_warning Ships= " .. selectedlevel:getShips())
+    --local stream = selectedlevel:getShips()
+    --local substr = stream
+    --while substr.find(",")
+    --[[
     local size = orxonox.LevelManager:getInstance():getNumberOfLevels()
     local index = 0
@@ -60 +62 @@
         end
         index = index + 1
-    end
+    end--]]
 end
+
+
 
 function P.createFilterTab(name, tag)

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

@@ -6 +6 @@
 P.activeTabIndexes = {}
 P.scrollbarWidth = 13
+selectedlevel = {} -- level for ship selection
 
 function P.onLoad()
@@ -141 +142 @@
 
 function P.SingleplayerStartButton_clicked(e)
-    local level = P.SingleplayerGetSelectedLevel()
-    if level ~= nil then
-
-        if level:hasTag("shipselection") then
+    selectedlevel = P.SingleplayerGetSelectedLevel()
+    if selectedlevel ~= nil then
+        if selectedlevel:hasTag("shipselection") then
             local shipSelectionMenu = showMenuSheet("ShipSelectionMenu", true)
-            shipSelectionMenu:loadShips(level:getXMLFilename())
         else
-            orxonox.execute("startGame " .. level:getXMLFilename())
+            orxonox.execute("startGame " .. selectedlevel:getXMLFilename())
             hideAllMenuSheets()
         end