Added check before attempting to remove actor's collision object from world

8 years ago · e30dfb13d3
parent 2eb6ef50ca
commit e30dfb13d3
1 changed files with 4 additions and 1 deletions
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@ -72,7 +72,10 @@ void Actor::enableCollisionBody(bool collision)

 void Actor::updateCollisionMask()
 {
-    mCollisionWorld->removeCollisionObject(mCollisionObject.get());
+    if (mCollisionObject.get()->getWorldArrayIndex() >= 0)
+    {
+        mCollisionWorld->removeCollisionObject(mCollisionObject.get());
+    }
    int collisionMask = CollisionType_World | CollisionType_HeightMap;
    if (mExternalCollisionMode)
        collisionMask |= CollisionType_Actor | CollisionType_Projectile | CollisionType_Door;