Changeset 7545 for code/trunk/src/modules/pickup/items/InvisiblePickup.cc

Timestamp:

Oct 15, 2010, 8:35:20 AM (15 years ago)

Author:

dafrick

Message:

Improvements in InvisiblePickup.

File:

• code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) (2 diffs)

code/trunk/src/modules/pickup/items/InvisiblePickup.cc

@@ -99 +99 @@
 
         this->initializeIdentifier();
-        this->setDurationType(Pickup::durationTypeOnce_s); // The duration type is always once.
     }
 
@@ -135 +134 @@
             this->setInvisible(false);
 
-            if(this->isContinuous() || !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
+            if((!this->isContinuous() && this->isImmediate()) || (!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
             {
                 this->Pickupable::destroy();
             }
-            else
+            else if(this->durationTimer_.isActive())
             {
                 this->durationTimer_.pauseTimer();