Changeset 9281 for code/branches/presentation2012merge/data/gui

Timestamp:

Jun 9, 2012, 3:51:51 PM (12 years ago)

Author:

landauf

Message:

small cleanup in ship selection:

• renamed some functions
• moved implementation of changeStartingShip() from header to source file
• removed ShipManager which doesn't seem to be used nor compiled (and it's just a copy of LevelManager anyway)

Location:

code/branches/presentation2012merge/data/gui/scripts

Files:

• ShipSelectionMenu.lua (modified) (3 diffs)
• SingleplayerMenu.lua (modified) (1 diff)

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

@@ -19 +19 @@
    P.shipList = {}
    for line in io.lines("../levels/templates/.shipmodels") do  --checks if shipmodel is included in level file
-    if selectedlevel:hasShip(string.lower(line)) then
+    if selectedlevel:hasStartingShip(string.lower(line)) then
         P.shipList[#P.shipList+1] = string.lower(line)
     end
@@ -32 +32 @@
     for k,v in pairs(P.shipList) do
         --TODO: only add ship if is in the right filter tab
-        --if tag == nil or v:hasShip(tag) then
+        --if tag == nil or v:hasStartingShip(tag) then
             local item = CEGUI.createListboxTextItem(v)
             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
@@ -107 +107 @@
 
     if (selectedlevel ~= nil and P.ShipSelectionGetSelectedModel() ~= nil)  then
-    selectedlevel:selectShip(P.ShipSelectionGetSelectedModel())
+    selectedlevel:selectStartingShip(P.ShipSelectionGetSelectedModel())
         orxonox.execute("startGame " .. "_temp.oxw")
         hideAllMenuSheets()

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

@@ -48 +48 @@
         level = orxonox.LevelManager:getInstance():getAvailableLevelListItem(index)
         if (level ~= nil and level:getXMLFilename() ~= "_temp.oxw") then
-            --os.execute("echo " .. level:getXMLFilename() .." >> ~/outputorx")
             local levelXMLFilename = level:getXMLFilename()
             -- create an imageset for each screenshot