Changeset 9277 for code/branches/presentation2012merge

Timestamp:

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

Author:

landauf

Message:

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

Location:

code/branches/presentation2012merge/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (2 diffs)

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))

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

@@ -165 +165 @@
             inline void setDamageMultiplier(float multiplier)
                 { this->damageMultiplier_ = multiplier; }
-            inline float getDamageMultiplier()
+            inline float getDamageMultiplier() const
                 { return this->damageMultiplier_; }
 
@@ -210 +210 @@
             float maxShieldHealth_;
             float initialShieldHealth_;
-            float shieldAbsorption_; // Has to be between 0 and 1
+            float shieldAbsorption_; ///< Has to be between 0 and 1
             float reloadRate_;
             float reloadWaitTime_;
             float reloadWaitCountdown_;
 
-            // Modifier
-            float damageMultiplier_; // Used by the Damage Boost Pickup.
+            float damageMultiplier_; ///< Used by the Damage Boost Pickup.
 
             WeakPtr<Pawn> lastHitOriginator_;