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

Timestamp:

Apr 12, 2010, 4:08:15 PM (15 years ago)

Author:

ebeier

Message:

added some speedpickup templates

File:

• code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (modified) (4 diffs)

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

@@ -137 +137 @@
         if(this->isUsed())
         {
-            this->startPickupTimer(this->getDuration());
-
             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());
@@ -208 +208 @@
         {
             COUT(1) << "Invalid duration in SpeedPickup." << std::endl;
-            this->duration_ = 0;
+            this->duration_ = 0.0f;
         }
     }
@@ -227 +227 @@
         {
             COUT(1) << "Invalid speedAdd in SpeedPickup." << std::endl;
-            this->speedAdd_ = 0.0;
+            this->speedAdd_ = 0.0f;
         }
     }
@@ -246 +246 @@
         {
             COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;
-            this->speedMultiply_ = 1.0;
+            this->speedMultiply_ = 1.0f;
         }
     }
 
     void SpeedPickup::PickupTimerCallBack(void) {
-        /* Reset values */
+            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);
     }
 }