Changeset 7208

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.

Location:

code/trunk/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• Pickup.h (modified) (2 diffs)
• items/InvisiblePickup.cc (modified) (3 diffs)
• items/InvisiblePickup.h (modified) (1 diff)
• items/ShieldPickup.cc (modified) (3 diffs)
• items/ShieldPickup.h (modified) (2 diffs)
• items/SpeedPickup.cc (modified) (3 diffs)
• items/SpeedPickup.h (modified) (2 diffs)

code/trunk/src/modules/pickup/Pickup.cc

@@ -236 +236 @@
     }
 
-    /**
-    @brief
-        Starts the pickup duration timer.
-        After the specified durationTime has expired the function pickupTimerCallback is called.
-        pickupTimerCallback can be overloaded and thus the desired functionality can be implemented.
-    @param durationTime
-        The duration after which the expires and the callback function is called.
-    @return
-        Returns true if the pickup duration timer was started successfully, false if not.
-    */
-    bool Pickup::startPickupTimer(float durationTime)
-    {
-        if (durationTime<=0)
-        {
-            COUT(1) << "Invalid durationTime in pickup." << std::endl;
-            return false;
-        }
-        if (this->durationTimer_.isActive()) //!< Check if Timer is already running
-        {
-            COUT(1) << "Pickup durationTimer already in use." << std::endl;
-            return false;
-        }
-        this->durationTimer_.setTimer(durationTime, false, createExecutor(createFunctor(&Pickup::pickupTimerCallback, this)));
-        return true;
-    }
 }

code/trunk/src/modules/pickup/Pickup.h

@@ -133 +133 @@
             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
 
-            bool startPickupTimer(float durationTime); //!< Starts the pickup duration timer.
-            /**
-            @brief Get your Timer.
-            @return Returns a pointer to the Timer.
-            */
-            inline Timer* getTimer(void)
-                { return &this->durationTimer_; }
-
-            /**
-            @brief The callback method for the Timer.
-                   Can be overloaded to implement desired functionality.
-            */
-            virtual void pickupTimerCallback(void) {}
-
             /**
             @brief Set the activation type of the pickup.
@@ -166 +152 @@
             void initialize(void); //!< Initializes the member variables.
 
-            //TODO: Problems, when there are more Timers needed? Solutions?
-            Timer durationTimer_; //!< Timer at the disposal of each Class implementing Pickup.
-
             pickupActivationType::Value activationType_; //!< The activation type of the Pickup.
             pickupDurationType::Value durationType_; //!< The duration type of the pickup.

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

@@ -115 +115 @@
         if (this->isUsed())
         {
-            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() > 0.0f)
-            {
-                this->getTimer()->unpauseTimer();
+            if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() > 0.0f)
+            {
+                this->durationTimer_.unpauseTimer();
             }
             else
             {
-                this->startPickupTimer(this->getDuration());
+                this->durationTimer_.setTimer(this->getDuration(), false, createExecutor(createFunctor(&InvisiblePickup::pickupTimerCallback, this)));
             }
 
@@ -131 +131 @@
             this->setInvisible(false);
 
-            if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
+            if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
             {
                 this->Pickupable::destroy();
@@ -137 +137 @@
             else
             {
-                this->getTimer()->pauseTimer();
+                this->durationTimer_.pauseTimer();
             }
         }

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

@@ -77 +77 @@
             void setDuration(float duration);
             void initializeIdentifier(void);
-            virtual void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
+            void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
 
         private:
             void initialize(void); //!< Initializes the member variables.
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
+
+            Timer durationTimer_; //!< Timer.
+
             bool invisible_; //!< Helper to remember wether the Pawn is invisible.
             float duration_; //! Duration of invisibility.

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

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

@@ -80 +80 @@
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
 
-            virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
+            void pickupTimerCallback(void); //!< Function that gets called when timer ends.
 
             void setDuration(float duration);
@@ -90 +90 @@
             Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
 
+            Timer durationTimer_; //!< Timer.
+
             float duration_; //!< The health that is transferred to the Pawn.
             float shieldHealth_;

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

@@ -141 +141 @@
         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(&SpeedPickup::pickupTimerCallback, this)));
             }
             engine->setSpeedAdd(this->getSpeedAdd());
@@ -159 +159 @@
             if(this->isOnce())
             {
-                if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
+                if(!this->durationTimer_.isActive() && this->durationTimer_.getRemainingTime() == this->getDuration())
                 {
                     this->Pickupable::destroy();
@@ -165 +165 @@
                 else
                 {
-                    this->getTimer()->pauseTimer();
+                    this->durationTimer_.pauseTimer();
                 }
             }

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

@@ -79 +79 @@
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
 
-            virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
+            void pickupTimerCallback(void); //!< Function that gets called when timer ends.
 
             void setDuration(float duration);
@@ -89 +89 @@
             Engine* carrierToEngineHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
 
+            Timer durationTimer_; //!< Timer.
+
             float duration_; //!< The health that is transferred to the Pawn.
             float speedAdd_;