Changeset 9184 for code/branches/pickup2012/src/orxonox/worldentities

Timestamp:

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

Author:

lkevin

Message:

Finished DamageBoost Pickup and the XML inclusions are working now.

Location:

code/branches/pickup2012/src/orxonox/worldentities/pawns

Files:

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

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();
         }

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

@@ -162 +162 @@
                 { return this->numexplosionchunks_; }
 
-            // not that beautiful yet
+            // These are used with the Damage Boost Pickup to use the damage multiplier.
             inline void setDamageMultiplier(float multiplier)
                 { this->damageMultiplier_ = multiplier; }
@@ -215 +215 @@
             float reloadWaitCountdown_;
 
-            // modifiers
-            float damageMultiplier_;
+            // Modifier
+            float damageMultiplier_; // Used by the Damage Boost Pickup.
 
             WeakPtr<Pawn> lastHitOriginator_;