Changeset 7208 for code/trunk/src/modules/pickup/items/ShieldPickup.cc

Timestamp:

Aug 24, 2010, 9:49:54 AM (14 years ago)

Author:

dafrick

Message:

Removed Timer from Pickup, as this is no his core functionality.

File:

• code/trunk/src/modules/pickup/items/ShieldPickup.cc (modified) (3 diffs)

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

@@ -160 +160 @@
         if(this->isUsed())
         {
-            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() > 0.0f)
+            if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() > 0.0f)
             {
-                this->getTimer()->unpauseTimer();
+                this->durationTimer_.unpauseTimer();
             }
             else
             {
-                this->startPickupTimer(this->getDuration());
+                this->durationTimer_.setTimer(this->getDuration(), false, createExecutor(createFunctor(&ShieldPickup::pickupTimerCallback, this)));
             }
             pawn->setShieldAbsorption(this->getShieldAbsorption());
@@ -179 +179 @@
             if(this->isOnce())
             {
-                if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
+                if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
                 {
                     this->Pickupable::destroy();
@@ -185 +185 @@
                 else
                 {
-                    this->getTimer()->pauseTimer();
+                    this->durationTimer_.pauseTimer();
                 }
             }