Changeset 7546 for code/trunk/src/modules/pickup

Timestamp:

Oct 15, 2010, 8:43:02 AM (14 years ago)

Author:

dafrick

Message:

Ok, this should finally do it.

File:

• code/trunk/src/modules/pickup/items/InvisiblePickup.cc (modified) (1 diff)

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

@@ -134 +134 @@
             this->setInvisible(false);
 
-            if((!this->isContinuous() && this->isImmediate()) || (!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
+            if((!this->isContinuous() && this->isImmediate()) || (this->isContinuous() && !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration()))
             {
                 this->Pickupable::destroy();
             }
-            else if(this->durationTimer_.isActive())
+            else if(this->isContinuous() && this->durationTimer_.isActive())
             {
                 this->durationTimer_.pauseTimer();