Changeset 6669 for code/branches/pickup4/data

Timestamp:

Apr 1, 2010, 10:21:35 AM (15 years ago)

Author:

dafrick

Message:

Committing recent changes in PickupInventory, to be able to try out some things and easily revert if they don't work out.

File:

• code/branches/pickup4/data/gui/scripts/PickupInventory.lua (modified) (3 diffs)

code/branches/pickup4/data/gui/scripts/PickupInventory.lua

@@ -13 +13 @@
 P.layoutString = "PickupInventory.layout"
 
-function P:init()
+P.carrierList = {}
+
+function P.init()
     
 end
 
-function P:show()
-    self.window:show() -- TODO: Do this through parent...
-    self.visible = true
+function P.show()
+    P.window:show() -- TODO: Do this through parent...
+    P.visible = true
     
-    carrierList = {}
+    table.insert(P.carrierList, 4)
     
-    -- TODO: Nicer?
     local pickupManager = orxonox.PickupManager:getInstance()
     local carrier = pickupManager:getPawn()
     P.getCarrierList(carrier)
     
-    for k,v in pairs(carrierList) do
+    for k,v in pairs(P.carrierList) do
         local args = {}
         table.insert(args, v)
@@ -43 +44 @@
     end
     
-    table.insert(carrierList, carrier)
+    table.insert(P.carrierList, carrier)
     
-    local numCarriers = orxonox.PickupManager.getInstance():getNumCarrierChildren(carrier)
+    local numCarriers = orxonox.PickupManager:getInstance():getNumCarrierChildren(carrier)
     if numCarriers == 0 then
         return
@@ -51 +52 @@
     
     for i=0,numCarriers-1,1 do
-        local child = orxonox.PickupManager.getInstance():getCarrierChild(i, carrier)
+        local child = orxonox.PickupManager:getInstance():getCarrierChild(i, carrier)
         if child ~= nil then
             P.getCarrierList(child)