Changeset 6477 for code/branches/pickup3/src/modules/pickup/Pickup.cc

Timestamp:

Mar 6, 2010, 7:44:04 PM (14 years ago)

Author:

dafrick

Message:

Some more documenting. Completed HealthPickup.

File:

• code/branches/pickup3/src/modules/pickup/Pickup.cc (modified) (1 diff)

code/branches/pickup3/src/modules/pickup/Pickup.cc

@@ -192 +192 @@
         
         //! Sets the Pickup to used if the Pickup has activation type 'immediate' and gets picked up.
-        if(this->isPickedUp() && this->isImmediate())
+        if(this->getCarrier() != NULL && this->isPickedUp() && this->isImmediate())
         {
             this->setUsed(true);