reset reference to player NPC record during cleanup

11 years ago · 6584a01d01
parent 1b7697a4b2
commit 6584a01d01
1 changed files with 4 additions and 3 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -276,15 +276,16 @@ namespace MWWorld

        mWorldScene->changeToVoid();

+        mStore.clearDynamic();
+        mStore.setUp();
+
        if (mPlayer)
        {
            mPlayer->setCell (0);
            mPlayer->getPlayer().getRefData() = RefData();
+            mPlayer->set (mStore.get<ESM::NPC>().find ("player"));
        }

-        mStore.clearDynamic();
-        mStore.setUp();
-
        mCells.clear();

        mProjectiles.clear();