Merge branch 'soundgenorder' into 'master'

Write SoundGens after their creatures See merge request OpenMW/openmw!4420
OpenMW · Oct 23, 2024 · 69fa1ee · 69fa1ee
2 parents 462e118 + 9395624
commit 69fa1ee
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
@@ -97,9 +97,6 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
     appendStage(
         new WriteCollectionStage<CSMWorld::IdCollection<ESM::BodyPart>>(mDocument.getData().getBodyParts(), mState));
 
-    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator>>(
-        mDocument.getData().getSoundGens(), mState));
-
     appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::MagicEffect>>(
         mDocument.getData().getMagicEffects(), mState));
 
@@ -108,6 +105,10 @@ CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectP
 
     appendStage(new WriteRefIdCollectionStage(mDocument, mState));
 
+    // Can reference creatures so needs to load after them for TESCS compatibility
+    appendStage(new WriteCollectionStage<CSMWorld::IdCollection<ESM::SoundGenerator>>(
+        mDocument.getData().getSoundGens(), mState));
+
     appendStage(new CollectionReferencesStage(mDocument, mState));
 
     appendStage(new WriteCellCollectionStage(mDocument, mState));