Engine: fixed save ver constants for Characters and RoomStates

adventuregamestudio · Oct 23, 2023 · 7871326 · 7871326
1 parent 9159ea3
commit 7871326
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Engine/ac/characterextras.h b/Engine/ac/characterextras.h
@@ -28,7 +28,7 @@ using namespace AGS; // FIXME later
 enum CharacterSvgVersion
 {
     kCharSvgVersion_Initial = 0,
-    // 1 was skipped somehow
+    kCharSvgVersion_350     = 1, // new movelist format (along with pathfinder)
     kCharSvgVersion_36025   = 2, // animation volume
     kCharSvgVersion_36109   = 3, // removed movelists, save externally
 };

diff --git a/Engine/ac/roomstatus.h b/Engine/ac/roomstatus.h
@@ -38,8 +38,8 @@ struct HotspotState
 enum RoomStatSvgVersion
 {
     kRoomStatSvgVersion_Initial  = 0,
-    kRoomStatSvgVersion_36016    = 1, // hotspot and object names
-    // 2 was practically unused
+    kRoomStatSvgVersion_350      = 1, // new movelist format (along with pathfinder)
+    kRoomStatSvgVersion_36016    = 2, // hotspot and object names
     kRoomStatSvgVersion_36025    = 3, // object animation volume
     kRoomStatSvgVersion_36041    = 4, // room state's contentFormat
     kRoomStatSvgVersion_36109    = 5, // removed movelists, save externally

diff --git a/Engine/game/savegame_components.cpp b/Engine/game/savegame_components.cpp
@@ -558,6 +558,7 @@ HSaveError ReadCharacters(Stream *in, int32_t cmp_ver, const PreservedParams& /*
     HSaveError err;
     if (!AssertGameContent(err, in->ReadInt32(), game.numcharacters, "Characters"))
         return err;
+    const int mls_cmp_ver = cmp_ver > kCharSvgVersion_Initial ? kMoveSvgVersion_350 : kMoveSvgVersion_Initial;
     for (int i = 0; i < game.numcharacters; ++i)
     {
         game.chars[i].ReadFromFile(in, kGameVersion_Undefined, cmp_ver);
@@ -566,9 +567,9 @@ HSaveError ReadCharacters(Stream *in, int32_t cmp_ver, const PreservedParams& /*
         if (loaded_game_file_version <= kGameVersion_272)
             ReadTimesRun272(*game.intrChar[i], in);
         // character movement path (for old saves)
-        if (cmp_ver < 3)
+        if (cmp_ver < kCharSvgVersion_36109)
         {
-            err = mls[CHMLSOFFS + i].ReadFromFile(in, cmp_ver > 0 ? 1 : 0);
+            err = mls[CHMLSOFFS + i].ReadFromFile(in, mls_cmp_ver);
             if (!err)
                 return err;
         }
@@ -1102,7 +1103,7 @@ HSaveError ReadThisRoom(Stream *in, int32_t cmp_ver, const PreservedParams& /*pp
         int objmls_count = in->ReadInt32();
         if (!AssertCompatLimit(err, objmls_count, CHMLSOFFS, "room object move lists"))
             return err;
-        const int mls_cmp_ver = cmp_ver > 0 ? 1 : 0;
+        const int mls_cmp_ver = cmp_ver > kRoomStatSvgVersion_Initial ? kMoveSvgVersion_350 : kMoveSvgVersion_Initial;
         for (int i = 0; i < objmls_count; ++i)
         {
             err = mls[i].ReadFromFile(in, mls_cmp_ver);