Changeset 8502 for code/branches

Timestamp:

May 18, 2011, 12:36:59 PM (14 years ago)

Author:

dafrick

Message:

Minor changes.

Location:

code/branches/pickup

Files:

• data/levels/pickups.oxw (modified) (1 diff)
• src/modules/pickup/items/ShrinkPickup.cc (modified) (4 diffs)
• src/modules/pickup/items/ShrinkPickup.h (modified) (1 diff)

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

@@ -184 +184 @@
     </PickupRepresentation>
 
-    <!--PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
         <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
       </pickup>
-    </PickupSpawner-->
+    </PickupSpawner>
 
     <PickupSpawner position="-30,-30,-30" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">

code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Damian 'Mozork' Frick
+ *      Sandro Sgier
  *   Co-authors:
  *      ...
@@ -97 +97 @@
             durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));
         }
-        else
-        {
-            this->Pickupable::destroy();
-        }
     }
 
@@ -144 +140 @@
         }
         else if(isTerminating_ == true)
-        setUsed(false);
+            this->Pickupable::destroy();
+
     }
 
@@ -151 +148 @@
         isActive_ = false;
         isTerminating_ = true;
+        setUsed(false);
     }
 

code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h

@@ -21 +21 @@
  *
  *   Author:
- *      Damian 'Mozork' Frick
+ *      Sandro Sgier
  *   Co-authors:
  *      ...