Changeset 9277 for code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Jun 4, 2012, 9:40:54 PM (12 years ago)

Author:

landauf

Message:

small cleanup of damage multiplier: added 'const' to getter and removed unnecessary dynamic_cast

File:

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

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

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