diff options
| author | scrawl <scrawl@baseoftrash.de> | 2017-06-30 00:51:26 +0200 |
|---|---|---|
| committer | scrawl <scrawl@baseoftrash.de> | 2017-06-30 00:52:28 +0200 |
| commit | 9c94244b284562fcd7e152cf0c35abcb99cc6eb1 (patch) | |
| tree | a564b148aa26211597e0b49d8468277a8da47ded | |
| parent | ec458ef385cb49b24f39b916f4e45d92e22b9acb (diff) | |
Fix crash introduced by commit 1d8a9ff62243cb6b8e218840d839e6d554f3e8d9 (Fixes #3940)
| -rw-r--r-- | apps/openmw/mwworld/worldimp.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index a22075abdf..7fbf2965a2 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -378,8 +378,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) && |