Changeset 10270

Timestamp:

Feb 14, 2015, 10:49:23 PM (10 years ago)

Author:

landauf

Message:

fixed crash: cs can be null (e.g. when using the 'suicide' command)

File:

• code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -159 +159 @@
     void ModularSpaceShip::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
-        if (this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) != NULL)
+        if (cs != NULL && this->getPartOfEntity((StaticEntity*)(cs->getUserPointer())) != NULL)
             this->getPartOfEntity((StaticEntity*)(cs->getUserPointer()))->handleHit(damage, healthdamage, shielddamage, originator);
         else