Changeset 6575 for code/branches/ppspickups1/src/modules/pickup

Timestamp:

Mar 20, 2010, 7:45:01 PM (15 years ago)

Author:

ebeier

Message:

SpeedPickup Class is now "working" (able to spawn/be picked up), but speed-manipulation of pawn still missing.

File:

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

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

@@ -74 +74 @@
     void SpeedPickup::initialize(void)
     {
-        this->duration_ = 0;
-        this->speedAdd_ = 0;
-        this->speedMultiply_ = 0;
+        this->duration_ = 0.0;
+        this->speedAdd_ = 0.0;
+        this->speedMultiply_ = 1.0;
 
         this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
@@ -269 +269 @@
     void SpeedPickup::setSpeedMultiply(float speedMultiply)
     {
-        if(speedMultiply > 0.0f)
+        if(speedMultiply != 0.0f)
         {
             this->speedMultiply_ = speedMultiply;
@@ -276 +276 @@
         {
             COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;
-            this->speedMultiply_ = 0.0;
+            this->speedMultiply_ = 1.0;
         }
     }