Changeset 6706 for code/branches/ppspickups1/src/modules/pickup/items

Timestamp:

Apr 13, 2010, 12:41:52 AM (15 years ago)

Author:

dafrick

Message:

Small adaptations in SpeedPickup.

Location:

code/branches/ppspickups1/src/modules/pickup/items

Files:

• SpeedPickup.cc (modified) (3 diffs)
• SpeedPickup.h (modified) (3 diffs)

code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc

@@ -75 +75 @@
     void SpeedPickup::initialize(void)
     {
-        this->duration_ = 0.0;
-        this->speedAdd_ = 0.0;
-        this->speedMultiply_ = 1.0;
+        this->duration_ = 0.0f;
+        this->speedAdd_ = 0.0f;
+        this->speedMultiply_ = 1.0f;
 
         this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
@@ -134 +134 @@
             return;
 
+        Engine* engine = this->carrierToEngineHelper();
+        if(engine == NULL) //!< If the PickupCarrier is no Engine, then this pickup is useless and therefore is destroyed.
+            this->destroy();
+        
         //! If the pickup has transited to used.
         if(this->isUsed())
         {
-            Engine* engine = this->carrierToEngineHelper();
-            if(engine == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
-                this->destroy();
-
             this->startPickupTimer(this->getDuration());
             engine->setSpeedAdd(this->getSpeedAdd());
             engine->setSpeedMultiply(this->getSpeedMultiply());
         }
-    }
-
-
+        else
+        {
+            engine->setSpeedAdd(0.0f);
+            engine->setSpeedMultiply(1.0f);
+            
+            if(this->isOnce())
+            {
+                this->destroy();
+            }
+        }
+    }
 
     /**
@@ -250 +258 @@
     }
 
-    void SpeedPickup::PickupTimerCallBack(void) {
-            Engine* engine = this->carrierToEngineHelper();
-            if(engine == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
-                this->destroy();
-
-            engine->setSpeedAdd(0.0f);
-            engine->setSpeedMultiply(1.0f);
+    void SpeedPickup::pickupTimerCallback(void)
+    {       
+        this->setUsed(false);
     }
 }

code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h

@@ -38 +38 @@
 
 #include <string>
-#include <worldentities/pawns/Pawn.h>
+#include "worldentities/pawns/Pawn.h"
 #include "worldentities/StaticEntity.h"
 
@@ -78 +78 @@
         protected:
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
+            
+            virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
 
             void setDuration(float duration);
@@ -85 +87 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            void PickupTimerCallBack(void); //!< Function that gets called when timer ends.
             Engine* carrierToEngineHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.