Changeset 9118 for code/branches/pickup2012/src

Timestamp:

Apr 27, 2012, 2:36:52 PM (12 years ago)

Author:

lkevin

Message:

First working version. Default damage increase is
currently set to 20. Now fixing things and documenting.

File:

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

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

@@ -232 +232 @@
     {
         // apply multiplier
-        damage *= originator->getDamageMultiplier();
+        Pawn *test = dynamic_cast<Pawn *>(originator);
+        if( test != NULL )
+          damage *= originator->getDamageMultiplier();
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))