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

Timestamp:

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

Author:

dafrick

Message:

Fixing bug I introduced.

File:

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

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

@@ -116 +116 @@
         if (this->isUsed())
         {
-            if(this->isContinuous()
+            if(this->isContinuous())
             {
                 if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() > 0.0f)
@@ -135 +135 @@
             this->setInvisible(false);
 
-            if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
+            if(this->isContinuous() || !this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
             {
                 this->Pickupable::destroy();
@@ -213 +213 @@
     /**
     @brief
-        Sets the duration.
+        Sets the time the InvisibilityPickup will last.
     @param duration
-        The duration
+        The duration in seconds.
     */
     void InvisiblePickup::setDuration(float duration)
@@ -230 +230 @@
     }
 
+    /**
+    @brief
+        Helper method. Is called by the Timer as soon as it expires.
+    */
     void InvisiblePickup::pickupTimerCallback(void)
     {