Changeset 5529 for data/media/gui

Timestamp:

May 23, 2009, 9:50:54 AM (15 years ago)

Author:

danielh

Message:

Some changes on pickups

File:

• data/media/gui/scripts/PickupInventory.lua (modified) (2 diffs)

data/media/gui/scripts/PickupInventory.lua

@@ -3 +3 @@
 -- variables
 local winMgr = CEGUI.WindowManager:getSingleton()
+
 local lastEquipmentCount_ = 0
 local lastUsableCount_ = 0
-
-local currentUsableID_ = -1
-local lastUsedEquipID_ = 0
-local lastUsedUsableID_ = 0
+local currentUsableID_ = 0
 
 -- events
-function tabChanged(e)
-    local we = CEGUI.toWindowEventArgs(e)
-    orxonox.PickupInventory:tabChanged(we.window)
-end
 function frmUpdate(e)
     local equipCount = orxonox.PickupInventory:getEquipmentCount()
@@ -48 +42 @@
     local eqWin = winMgr:getWindow("orxonox/Inventory/TabControl/TabEquipment")
     local usWin = winMgr:getWindow("orxonox/Inventory/TabControl/TabUsable")
-    orxonox.PickupInventory:clearInventory(winMgr, lastEquipmentCount_, lastUsableCount_)
-    orxonox.PickupInventory:updateTabs(winMgr, eqWin, usWin)
+    orxonox.PickupInventory:getSingleton():clearInventory(winMgr, eqWin, usWin)
+    orxonox.PickupInventory:getSingleton():updateTabs(winMgr, eqWin, usWin)
     
     currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()