Make sure adjustPosition() is safe to call for any actor

4 years ago · 201999c4a9
parent c8d85dcf30
commit 201999c4a9
1 changed files with 5 additions and 1 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -1345,7 +1345,11 @@ namespace MWWorld

        moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
        if (ptr.getClass().isActor())
-            mPhysics->getActor(ptr)->resetPosition();
+        {
+            MWPhysics::Actor* actor = mPhysics->getActor(ptr);
+            if (actor)
+                actor->resetPosition();
+        }
    }

    void World::fixPosition()