Changeset 9184 for code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

May 18, 2012, 12:47:54 PM (13 years ago)

Author:

lkevin

Message:

Finished DamageBoost Pickup and the XML inclusions are working now.

File:

• code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc

@@ -231 +231 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        // apply multiplier
+        //Applies multiplier given by the DamageBoost Pickup.
         Pawn *test = dynamic_cast<Pawn *>(originator);
         if( test != NULL )
-        { orxout() << "Test " << damage << endl;
+        {
           damage *= originator->getDamageMultiplier();
         }