Engine: drop support of pre-3.5.0-alpha movelist format version

This version was in public pre-alpha release and stayed for 3 months before being replaced by an updated format along with the new A* pathfinder.
adventuregamestudio · Oct 26, 2023 · 5ddadb0 · 5ddadb0
1 parent 24d2f58
commit 5ddadb0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/Engine/ac/characterextras.h b/Engine/ac/characterextras.h
@@ -27,7 +27,7 @@ using namespace AGS; // FIXME later
 
 enum CharacterSvgVersion
 {
-    kCharSvgVersion_Initial = 0,
+    kCharSvgVersion_Initial = 0, // [UNSUPPORTED] from 3.5.0 pre-alpha
     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/movelist.cpp b/Engine/ac/movelist.cpp
@@ -68,8 +68,8 @@ HSaveError MoveList::ReadFromSavegame(Stream *in, int32_t cmp_ver)
 {
     if (cmp_ver < kMoveSvgVersion_350)
     {
-        ReadFromSavegame_Legacy(in); // FIXME: pass an arg to not use padding; OR remove support of kMoveSvgVersion_Initial?
-        return HSaveError::None();
+        return new SavegameError(kSvgErr_UnsupportedComponentVersion,
+            String::FromFormat("Movelist format %d is no longer supported", cmp_ver));
     }
 
     *this = MoveList(); // reset struct

diff --git a/Engine/ac/movelist.h b/Engine/ac/movelist.h
@@ -33,7 +33,7 @@ enum MoveListDoneFlags
 
 enum MoveListSvgVersion
 {
-    kMoveSvgVersion_Initial = 0,
+    kMoveSvgVersion_Initial = 0, // [UNSUPPORTED] from 3.5.0 pre-alpha
     kMoveSvgVersion_350,   // new pathfinder, arbitrary number of stages
     kMoveSvgVersion_36109, // skip empty lists, progress as float
 };

diff --git a/Engine/ac/roomstatus.h b/Engine/ac/roomstatus.h
@@ -37,7 +37,7 @@ struct HotspotState
 // Savegame data format for RoomStatus
 enum RoomStatSvgVersion
 {
-    kRoomStatSvgVersion_Initial  = 0,
+    kRoomStatSvgVersion_Initial  = 0, // [UNSUPPORTED] from 3.5.0 pre-alpha
     kRoomStatSvgVersion_350      = 1, // new movelist format (along with pathfinder)
     kRoomStatSvgVersion_36016    = 2, // hotspot and object names
     kRoomStatSvgVersion_36025    = 3, // object animation volume

diff --git a/Engine/game/savegame_components.cpp b/Engine/game/savegame_components.cpp
@@ -558,7 +558,6 @@ 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].ReadFromSavegame(in, cmp_ver);
@@ -569,7 +568,7 @@ HSaveError ReadCharacters(Stream *in, int32_t cmp_ver, const PreservedParams& /*
         // character movement path (for old saves)
         if (cmp_ver < kCharSvgVersion_36109)
         {
-            err = mls[CHMLSOFFS + i].ReadFromSavegame(in, mls_cmp_ver);
+            err = mls[CHMLSOFFS + i].ReadFromSavegame(in, kMoveSvgVersion_350);
             if (!err)
                 return err;
         }
@@ -1102,10 +1101,9 @@ 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 > kRoomStatSvgVersion_Initial ? kMoveSvgVersion_350 : kMoveSvgVersion_Initial;
         for (int i = 0; i < objmls_count; ++i)
         {
-            err = mls[i].ReadFromSavegame(in, mls_cmp_ver);
+            err = mls[i].ReadFromSavegame(in, kMoveSvgVersion_350);
             if (!err)
                 return err;
         }
@@ -1212,7 +1210,7 @@ ComponentHandler ComponentHandlers[] =
     {
         "Characters",
         kCharSvgVersion_36109,
-        kCharSvgVersion_Initial,
+        kCharSvgVersion_350, // skip pre-alpha 3.5.0 ver
         WriteCharacters,
         ReadCharacters
     },
@@ -1282,21 +1280,21 @@ ComponentHandler ComponentHandlers[] =
     {
         "Room States",
         kRoomStatSvgVersion_36109,
-        kRoomStatSvgVersion_Initial,
+        kRoomStatSvgVersion_350, // skip pre-alpha 3.5.0 ver
         WriteRoomStates,
         ReadRoomStates
     },
     {
         "Loaded Room State",
         kRoomStatSvgVersion_36109, // must correspond to "Room States"
-        kRoomStatSvgVersion_Initial,
+        kRoomStatSvgVersion_350, // skip pre-alpha 3.5.0 ver
         WriteThisRoom,
         ReadThisRoom
     },
     {
         "Move Lists",
         kMoveSvgVersion_36109,
-        kMoveSvgVersion_Initial,
+        kMoveSvgVersion_350, // skip pre-alpha 3.5.0 ver
         WriteMoveLists,
         ReadMoveLists
     },