From 1b7b322bacaa4f2190fdfd66d6c3e17192ca090d Mon Sep 17 00:00:00 2001
From: Kuyondo <rdja.kyd@gmail.com>
Date: Mon, 28 Jul 2025 18:41:07 +0800
Subject: [PATCH] cleanup

---
 apps/openmw/mwworld/cellstore.cpp | 5 +++++
 apps/openmw/mwworld/refdata.cpp   | 4 ++--
 apps/openmw/mwworld/scene.cpp     | 2 +-
 components/esm3/formatversion.hpp | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 75ee14f627..ef9a0cafd9 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -298,6 +298,11 @@ namespace
                         iter->mData.enable();
                         MWBase::Environment::get().getWorld()->disable(ptr);
                     }
+                    else
+                    {
+                        if (state.mVersion < ESM::OpenMW0_50SaveGameFormatVersion)
+                            iter->mData.flagAsResolved();
+                    }
                     MWBase::Environment::get().getWorldModel()->registerPtr(ptr);
                     return;
                 }
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 0b8a3f85af..d8807f745c 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -20,7 +20,7 @@ namespace
                                    // can then be handled by a script.
         Flag_OnActivate = 2,
         Flag_ActivationBuffered = 4,
-        Flag_Resolved = 8,
+        Flag_Resolved = 8
     };
 }
 
@@ -134,7 +134,7 @@ namespace MWWorld
         try
         {
             copy(refData);
-            mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate | Flag_ActivationBuffered);
+            mFlags &= ~(Flag_SuppressActivate | Flag_OnActivate | Flag_ActivationBuffered | Flag_Resolved);
         }
         catch (...)
         {
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 5099bf15ba..b7c28017f1 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1134,7 +1134,7 @@ namespace MWWorld
     {
         const VFS::Path::Normalized meshPath = useAnim
             ? Misc::ResourceHelpers::correctActorModelPath(
-                  VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS())
+                VFS::Path::toNormalized(mesh), mRendering.getResourceSystem()->getVFS())
             : VFS::Path::toNormalized(mesh);
 
         if (mRendering.getResourceSystem()->getSceneManager()->checkLoaded(meshPath, mRendering.getReferenceTime()))
diff --git a/components/esm3/formatversion.hpp b/components/esm3/formatversion.hpp
index c205f2fbb7..f906ed842f 100644
--- a/components/esm3/formatversion.hpp
+++ b/components/esm3/formatversion.hpp
@@ -28,7 +28,7 @@ namespace ESM
     inline constexpr FormatVersion MaxOldCountFormatVersion = 30;
     inline constexpr FormatVersion MaxActiveSpellTypeVersion = 31;
     inline constexpr FormatVersion MaxPlayerBeforeCellDataFormatVersion = 32;
-    inline constexpr FormatVersion CurrentSaveGameFormatVersion = 34;
+    inline constexpr FormatVersion CurrentSaveGameFormatVersion = 35;
 
     inline constexpr FormatVersion MinSupportedSaveGameFormatVersion = 5;
     inline constexpr FormatVersion OpenMW0_48SaveGameFormatVersion = 21;