Changeset 7504 for code/trunk/data

Timestamp:

Oct 6, 2010, 8:00:40 AM (14 years ago)

Author:

dafrick

Message:

Pickups module is now (from what I can tell after some basic testing) fully functional over the network.
However it's still a little messy, needs some cleanup and documentation.
I introduced a new class, the PickupListener, which allows reacting to pickups becoming used, unused, picked up or dropped.

File:

• code/trunk/data/gui/scripts/PickupInventory.lua (modified) (11 diffs)

code/trunk/data/gui/scripts/PickupInventory.lua

@@ -45 +45 @@
                 local useButton = winMgr:getWindow("orxonox/PickupInventory/Details" .. k .. "/UseButton")
                 local dropButton = winMgr:getWindow("orxonox/PickupInventory/Details" .. k .. "/DropButton")
-                if orxonox.PickupManager:getInstance():isValidPickup(pickup) == false then
+                if orxonox.PickupManager:getInstance():isValidPickup(pickup.pickup) == false then
                     useButton:setEnabled(false)
                     dropButton:setEnabled(false)
@@ -51 +51 @@
                 else
                     useButton:setEnabled(true)
-                    if pickup:isUsed() == true then
+                    if pickup.inUse == true then
                         useButton:setText("unuse")
                         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseDetailButton_clicked")
-                        if pickup:isUsable() == false then
+                        if pickup.usable == false then
                             useButton:setEnabled(false)
                         end
@@ -60 +60 @@
                         useButton:setText("use")
                         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseDetailButton_clicked")
-                        if pickup:isUnusable() == false then
+                        if pickup.unusable == false then
                             useButton:setEnabled(false)
                         end
                     end
 
-                    if pickup:isPickedUp() == false then
+                    if pickup.pickedUp == false then
                         useButton:setEnabled(false)
                         dropButton:setEnabled(false)
@@ -108 +108 @@
 
 function P.createPickupEntry(index, pickup)
-    local representation = orxonox.PickupManager:getInstance():getPickupRepresentation(pickup)
+    local representation = orxonox.PickupManager:getInstance():getPickupRepresentation(pickup.pickup)
 
     local name = "orxonox/PickupInventory/Box/Pickup" .. index
@@ -133 +133 @@
     useButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.3, P.imageHeight+10),CEGUI.UDim(0, (P.imageHeight-P.textHeight)/2)))
     useButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.buttonWidth), CEGUI.UDim(0, P.textHeight)))
-    if pickup:isUsed() == false then
+    if pickup.inUse == false then
         useButton:setText("use")
         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseButton_clicked")
-        if pickup:isUsable() == false then
+        if pickup.usable == false then
             useButton:setEnabled(false)
         end
@@ -142 +142 @@
         useButton:setText("unuse")
         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseButton_clicked")
-        if pickup:isUnusable() == false then
+        if pickup.unusable == false then
             useButton:setEnabled(false)
         end
@@ -193 +193 @@
 function P.createDetailsWindow(pickupIndex)
     local pickup = P.pickupsList[pickupIndex]
-    local representation = orxonox.PickupManager:getInstance():getPickupRepresentation(pickup)
+    local representation = orxonox.PickupManager:getInstance():getPickupRepresentation(pickup.pickup)
 
     local index = P.getNewDetailNumber()
@@ -238 +238 @@
     useButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0, P.detailImageSize+10),CEGUI.UDim(1, -40)))
     useButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.buttonWidth), CEGUI.UDim(0, P.textHeight)))
-    if pickup:isUsed() == false then
+    if pickup.inUse == false then
         useButton:setText("use")
         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUseDetailButton_clicked")
-        if pickup:isUsable() == false then
+        if pickup.usable == false then
             useButton:setEnabled(false)
         end
@@ -247 +247 @@
         useButton:setText("unuse")
         orxonox.GUIManager:subscribeEventHelper(useButton, "Clicked", P.name .. ".InventoryUnuseDetailButton_clicked")
-        if pickup:isUnusable() == false then
+        if pickup.unusable == false then
             useButton:setEnabled(false)
         end
@@ -277 +277 @@
 function P.InventoryUseButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():usePickup(P.pickupsList[pickupIndex], true)
+    local pickup = P.pickupsList[pickupIndex]
+    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
 end
 
 function P.InventoryUnuseButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():usePickup(P.pickupsList[pickupIndex], false)
+    local pickup = P.pickupsList[pickupIndex]
+    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
 end
 
 function P.InventoryDropButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():dropPickup(P.pickupsList[pickupIndex])
+    local pickup = P.pickupsList[pickupIndex]
+    orxonox.PickupManager:getInstance():dropPickup(pickup.pickup)
 end
 
@@ -297 +300 @@
 function P.InventoryUseDetailButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():usePickup(P.detailPickups[pickupIndex], true)
+    local pickup = P.detailPickups[pickupIndex]
+    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, true)
 end
 
 function P.InventoryUnuseDetailButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():usePickup(P.detailPickups[pickupIndex], false)
+    local pickup = P.detailPickups[pickupIndex]
+    orxonox.PickupManager:getInstance():usePickup(pickup.pickup, false)
 end
 
 function P.InventoryDropDetailButton_clicked(e)
     local pickupIndex = P.windowToPickupHelper(e)
-    orxonox.PickupManager:getInstance():dropPickup(P.detailPickups[pickupIndex])
+    local pickup = P.detailPickups[pickupIndex]
+    orxonox.PickupManager:getInstance():dropPickup(pickup.pickup)
 end