Changeset 7008 for code/branches/presentation3/data

Timestamp:

May 29, 2010, 9:33:33 PM (15 years ago)

Author:

dafrick

Message:

Fixed a bug in pickups that caused the clone method of Pickup.h not to be called via SUPER.

File:

• code/branches/presentation3/data/levels/pickups.oxw (modified) (4 diffs)

code/branches/presentation3/data/levels/pickups.oxw

@@ -25 +25 @@
     <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" />
     <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
 
     <!-- Shield pickups -->
@@ -135 +134 @@
     <!-- Pickup Collection pickups -->
 
-    <PickupSpawner position="-50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="-50,25,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
       <pickup>
         <PickupCollection template=triplehealthspeedinvisibilitypickup />
@@ -141 +140 @@
     </PickupSpawner>
 
-        <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
+    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
     <PickupRepresentation
       pickupName = "Medium Health Pack"
@@ -153 +152 @@
     </PickupRepresentation>
 
-    <PickupSpawner position="-50,25,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
-        <HealthPickup health=50 activationType=onUse durationType=continuous />
+        <HealthPickup health=50 activationType=onUse durationType=once />
       </pickup>
     </PickupSpawner>