Changeset 7545 for code/trunk

Timestamp:

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

Author:

dafrick

Message:

Improvements in InvisiblePickup.

Location:

code/trunk/src

Files:

• libraries/tools/Timer.h (modified) (1 diff)
• modules/pickup/items/InvisiblePickup.cc (modified) (2 diffs)
• modules/pickup/items/InvisiblePickup.h (modified) (1 diff)

code/trunk/src/libraries/tools/Timer.h

@@ -133 +133 @@
             inline void unpauseTimer()
                 { this->bActive_ = true; }
-            /// Returns true if the Timer is active (neither stoped nor paused).
+            /// Returns true if the Timer is active (neither stopped nor paused).
             inline bool isActive() const
                 { return this->bActive_; }

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();

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

@@ -54 +54 @@
         - The <b>duration</b> Specifies how long (in seconds) the invisibility lasts.
 
+        An examle of a XML implementation of a InvisiblePickup would be:
+        @code
+        <HealthPickup
+            activationType = "immediate"
+            durationType = "continuous"
+            duration = 30.0
+        />
+        @endcode
+
     @author
         Benedict Simlinger