Engine: updated CharacterSvgVersion, for compatibility with v362

adventuregamestudio · Dec 29, 2024 · 9707f50 · 9707f50
1 parent a6369ff
commit 9707f50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Common/ac/characterinfo.h b/Common/ac/characterinfo.h
@@ -99,6 +99,7 @@ enum CharacterSvgVersion
     kCharSvgVersion_400     = 4000000, // extended graphic effects (blend, rotate,...)
     kCharSvgVersion_400_03  = 4000003, // compat with kCharSvgVersion_36115
     kCharSvgVersion_400_09  = 4000009, // 32-bit color properties
+    kCharSvgVersion_400_13  = 4000013, // compat with kCharSvgVersion_36205
 };
 
 

diff --git a/Engine/ac/characterextras.cpp b/Engine/ac/characterextras.cpp
@@ -86,7 +86,7 @@ void CharacterExtras::ReadFromSavegame(Stream *in, CharacterSvgVersion save_ver)
         in->ReadInt8(); // reserved to fill int32
         in->ReadInt8();
     }
-    if (save_ver >= kCharSvgVersion_36205)
+    if (save_ver >= kCharSvgVersion_36205 && (save_ver < kCharSvgVersion_400 || save_ver >= kCharSvgVersion_400_13))
     {
         following = in->ReadInt32();
         follow_dist = in->ReadInt32();

diff --git a/Engine/game/savegame_components.cpp b/Engine/game/savegame_components.cpp
@@ -598,11 +598,6 @@ HSaveError ReadCharacters(Stream *in, int32_t cmp_ver, soff_t cmp_size, const Pr
         auto &chex = charextra[i];
         chi.ReadFromSavegame(in, static_cast<CharacterSvgVersion>(cmp_ver));
         chex.ReadFromSavegame(in, static_cast<CharacterSvgVersion>(cmp_ver));
-        // re-assign legacy following params (for old saves)
-        if (cmp_ver < kCharSvgVersion_36205)
-        { // FIXME!!
-            //charextra[i].SetFollowing(&chi, chi.legacy_following, chi.get_follow_distance(), chi.get_follow_eagerness(), chi.get_follow_sort_behind());
-        }
         Properties::ReadValues(play.charProps[i], in);
     }
     return err;
@@ -1725,7 +1720,7 @@ ComponentHandler ComponentHandlers[] =
     },
     {
         "Characters",
-        kCharSvgVersion_400_09,
+        kCharSvgVersion_400_13,
         kCharSvgVersion_400,
         kSaveCmp_Characters,
         WriteCharacters,