Changeset 5529

Timestamp:

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

Author:

danielh

Message:

Some changes on pickups

Location:

data/media

Files:

• gui/scripts/PickupInventory.lua (modified) (2 diffs)
• levels/pickuptest.oxw (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()

data/media/levels/pickuptest.oxw

@@ -17 +17 @@
         <Jump velocity="0,0,500" jumpsAvailable="1" guiImage="decal.jpg" guiText="TEST" />
     </Template>
+    <Template name="jumpTest2" baseclass="Jump">
+        <Jump velocity="0,0,-500" jumpsAvailable="1" guiImage="dish.jpg" guiText="J2" />
+    </Template>
+    <Template name="jumpTest3" baseclass="Jump">
+        <Jump velocity="0,0,-500" jumpsAvailable="1" guiImage="sl_organic03.jpg" guiText="J3" />
+    </Template>
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
@@ -23 +29 @@
             <Model mesh="sphere.mesh" scale="3.0" />
             <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale="0.5" />
+        </attached>
+    </PickupSpawner>
+    <PickupSpawner item="jumpTest2" triggerDistance="20" respawnTime="5" position="140, 140, 140">
+        <attached>
+            <Model mesh="sphere.mesh" scale="3.0" />
+            <Billboard material="Examples/Flare" colour="1.0, 0.5, 0.3" scale="0.5" />
+        </attached>
+    </PickupSpawner>
+    <PickupSpawner item="jumpTest3" triggerDistance="20" respawnTime="5" position="180, 180, 180">
+        <attached>
+            <Model mesh="sphere.mesh" scale="3.0" />
+            <Billboard material="Examples/Flare" colour="0.5, 0.3, 1.0" scale="0.5" />
         </attached>
     </PickupSpawner>