Changeset 9278 for code/branches/presentation2012merge/src/orxonox

Timestamp:

Jun 4, 2012, 10:14:08 PM (12 years ago)

Author:

landauf

Message:

forgot that originator can be NULL

File:

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

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

@@ -232 +232 @@
     {
         // Applies multiplier given by the DamageBoost Pickup.
-        damage *= originator->getDamageMultiplier();
+        if (originator)
+            damage *= originator->getDamageMultiplier();
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))