Load present cell store when requested

1 year ago · 8ceb79caf5
parent 1a7b4283e7
commit 8ceb79caf5
1 changed files with 6 additions and 1 deletions
--- a/apps/openmw/mwworld/worldmodel.cpp
+++ b/apps/openmw/mwworld/worldmodel.cpp
@ -231,7 +231,12 @@ namespace MWWorld
    {
        auto it = mCells.find(id);
        if (it != mCells.end())
-            return &it->second;
+        {
+            CellStore& cellStore = it->second;
+            if (forceLoad && cellStore.getState() != CellStore::State_Loaded)
+                cellStore.load();
+            return &cellStore;
+        }

        if (id == draftCellId)
        {