Merge branch 'theeditorisjustanotherengine' into 'master'

Use ESM::ReadersCache in the editor Closes #7896 See merge request OpenMW/openmw!4111
OpenMW · May 21, 2024 · c87eaef · c87eaef
2 parents cd116eb + 77d5545
commit c87eaef
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -168,6 +168,7 @@
     Bug #7872: Region sounds use wrong odds
     Bug #7886: Equip and unequip animations can't share the animation track section
     Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save
+    Bug #7896: Editor: Loading cellrefs incorrectly transforms Refnums, causing load failures
     Bug #7898: Editor: Invalid reference scales are allowed
     Bug #7899: Editor: Doors can't be unlocked
     Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport

diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
@@ -17,13 +17,6 @@
 
 #include "document.hpp"
 
-CSMDoc::Loader::Stage::Stage()
-    : mFile(0)
-    , mRecordsLoaded(0)
-    , mRecordsLeft(false)
-{
-}
-
 CSMDoc::Loader::Loader()
     : mShouldStop(false)
 {
@@ -105,7 +98,7 @@ void CSMDoc::Loader::load()
 
         if (iter->second.mFile < size) // start loading the files
         {
-            std::filesystem::path path = document->getContentFiles()[iter->second.mFile];
+            const std::filesystem::path& path = document->getContentFiles()[iter->second.mFile];
 
             int steps = document->getData().startLoading(path, iter->second.mFile != editedIndex, /*project*/ false);
             iter->second.mRecordsLeft = true;

diff --git a/apps/opencs/model/doc/loader.hpp b/apps/opencs/model/doc/loader.hpp
@@ -23,11 +23,9 @@ namespace CSMDoc
 
         struct Stage
         {
-            int mFile;
-            int mRecordsLoaded;
-            bool mRecordsLeft;
-
-            Stage();
+            int mFile = 0;
+            int mRecordsLoaded = 0;
+            bool mRecordsLeft = false;
         };
 
         QMutex mMutex;

diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
@@ -305,9 +305,8 @@ void CSMDoc::WriteCellCollectionStage::writeReferences(
         {
             CSMWorld::CellRef refRecord = ref.get();
 
-            // Check for uninitialized content file
-            if (!refRecord.mRefNum.hasContentFile())
-                refRecord.mRefNum.mContentFile = 0;
+            // -1 is the current file, saved indices are 1-based
+            refRecord.mRefNum.mContentFile++;
 
             // recalculate the ref's cell location
             std::ostringstream stream;

diff --git a/apps/opencs/model/tools/mergestages.cpp b/apps/opencs/model/tools/mergestages.cpp
@@ -117,7 +117,7 @@ void CSMTools::MergeReferencesStage::perform(int stage, CSMDoc::Messages& messag
         ref.mOriginalCell = ref.mCell;
 
         ref.mRefNum.mIndex = mIndex[ref.mCell]++;
-        ref.mRefNum.mContentFile = 0;
+        ref.mRefNum.mContentFile = -1;
         ref.mNew = false;
 
         mState.mTarget->getData().getReferences().appendRecord(std::make_unique<CSMWorld::Record<CSMWorld::CellRef>>(