[Orxonox-commit 4607] r9278 - code/branches/presentation2012merge/src/orxonox/worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2012-06-04 22:14:08 +0200 (Mon, 04 Jun 2012)
New Revision: 9278

Modified:
   code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc
Log:
forgot that originator can be NULL

Modified: code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc	2012-06-04 19:40:54 UTC (rev 9277)
+++ code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc	2012-06-04 20:14:08 UTC (rev 9278)
@@ -231,7 +231,8 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
         // Applies multiplier given by the DamageBoost Pickup.
-        damage *= originator->getDamageMultiplier();
+        if (originator)
+            damage *= originator->getDamageMultiplier();
 
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {