Only mark valid actor ids for conversion

Assumeru · Assumeru · commit d3b4ea0ba73d · 2025-12-28T11:21:30.000+01:00
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
@@ -257,9 +257,9 @@ namespace
             if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
                 MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);
         }
-        if (reader.getActorIdConverter())
+        if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
         {
-            if constexpr (std::is_same_v<T, ESM::Creature> || std::is_same_v<T, ESM::NPC>)
+            if (reader.getActorIdConverter() && state.mHasCustomState)
             {
                 MWBase::Environment::get().getWorldModel()->assignSaveFileRefNum(state.mRef);
                 reader.getActorIdConverter()->mMappings.emplace(state.mCreatureStats.mActorId, state.mRef.mRefNum);

Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,9 @@ namespace`
`257`	`257`	`if constexpr (std::is_same_v<T, ESM::Creature> \|\| std::is_same_v<T, ESM::NPC>)`
`258`	`258`	`MWWorld::convertEnchantmentSlots(state.mCreatureStats, state.mInventory);`
`259`	`259`	`}`
`260`		`- if (reader.getActorIdConverter())`
	`260`	`+ if constexpr (std::is_same_v<T, ESM::Creature> \|\| std::is_same_v<T, ESM::NPC>)`
`261`	`261`	`{`
`262`		`- if constexpr (std::is_same_v<T, ESM::Creature> \|\| std::is_same_v<T, ESM::NPC>)`
	`262`	`+ if (reader.getActorIdConverter() && state.mHasCustomState)`
`263`	`263`	`{`
`264`	`264`	`MWBase::Environment::get().getWorldModel()->assignSaveFileRefNum(state.mRef);`
`265`	`265`	`reader.getActorIdConverter()->mMappings.emplace(state.mCreatureStats.mActorId, state.mRef.mRefNum);`