Changeset 6713 for code/trunk

Timestamp:

Apr 13, 2010, 10:49:13 AM (15 years ago)

Author:

dafrick

Message:

Adjusted SpeedPickup such that the Engine is the actual PickupCarrier now. (and not the Pawn)

File:

• code/trunk/src/modules/pickup/items/SpeedPickup.cc (modified) (2 diffs)

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

@@ -79 +79 @@
         this->speedMultiply_ = 1.0f;
 
-        this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
+        this->addTarget(ClassIdentifier<Engine>::getIdentifier());
     }
 
@@ -166 +166 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
-
-        if(ship == NULL)
+        Engine* engine = dynamic_cast<Engine*>(carrier);
+
+        if(engine == NULL)
         {
             COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;
         }
-        else
-        {
-            return ship->getEngine();
-        }
-
-        return 0;
+        
+        return engine;
     }