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

Timestamp:

Apr 20, 2012, 4:06:09 PM (12 years ago)

Author:

lkevin

Message:

Found a way to implement damage modifiers by
adding a flag to the pawn and then using this
flag in pawn::damage().

More compilation errors to be fixed though, a tick
function seems to be missing.

File:

• code/branches/pickup2012/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -75 +75 @@
         this->lastHitOriginator_ = 0;
 
+        // set damage multiplier to default value 1, meaning nominal damage
+        this->damageMultiplier_ = 1;
+
         this->spawnparticleduration_ = 3.0f;
 
@@ -228 +231 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
+        // apply multiplier
+        damage *= originator->getDamageMultiplier();
+
+        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
             if (shielddamage >= this->getShieldHealth())