Merge pull request #234 from OpenMW/master

Add OpenMW commits up to 30 Jun 2017
8 years ago · 99640da111
parent 1f682749d6 951c4e12e0
commit 99640da111
1 changed files with 5 additions and 2 deletions
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -412,8 +412,11 @@ namespace MWWorld
                return;
            case ESM::REC_PLAY:
                mPlayer->readRecord(reader, type);
-                mWorldScene->preloadCell(getPlayerPtr().getCell(), true);
-                mWorldScene->preloadTerrain(getPlayerPtr().getRefData().getPosition().asVec3());
+                if (getPlayerPtr().isInCell())
+                {
+                    mWorldScene->preloadCell(getPlayerPtr().getCell(), true);
+                    mWorldScene->preloadTerrain(getPlayerPtr().getRefData().getPosition().asVec3());
+                }
                break;
            default:
                if (!mStore.readRecord (reader, type) &&