Engine: tidy some code related to the old save format constants

adventuregamestudio · Aug 6, 2023 · c03e186 · c03e186
1 parent f90bbab
commit c03e186
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/Engine/game/savegame.cpp b/Engine/game/savegame.cpp
@@ -253,14 +253,14 @@ HSaveError ReadDescription_v321(Stream *in, SavegameVersion &svg_ver, SavegameDe
     else
         SkipSaveImage(in);
 
+    const Version low_compat_version(3, 2, 0, 1123);
     String version_str = String::FromStream(in);
     Version eng_version(version_str);
-    if (eng_version > EngineVersion ||
-        eng_version < SavedgameLowestBackwardCompatVersion)
+    if (eng_version > EngineVersion || eng_version < low_compat_version)
     {
         // Engine version is either non-forward or non-backward compatible
         return new SavegameError(kSvgErr_IncompatibleEngine,
-            String::FromFormat("Required: %s, supported: %s - %s.", eng_version.LongString.GetCStr(), SavedgameLowestBackwardCompatVersion.LongString.GetCStr(), EngineVersion.LongString.GetCStr()));
+            String::FromFormat("Required: %s, supported: %s - %s.", eng_version.LongString.GetCStr(), low_compat_version.LongString.GetCStr(), EngineVersion.LongString.GetCStr()));
     }
     if (elems & kSvgDesc_EnvInfo)
     {

diff --git a/Engine/main/main.cpp b/Engine/main/main.cpp
@@ -71,24 +71,8 @@ bool hideMessageBoxes = false;
 std::set<String> tellInfoKeys;
 String loadSaveGameOnStartup;
 
-// this needs to be updated if the "play" struct changes
-#define SVG_VERSION_BWCOMPAT_MAJOR      3
-#define SVG_VERSION_BWCOMPAT_MINOR      2
-#define SVG_VERSION_BWCOMPAT_RELEASE    0
-#define SVG_VERSION_BWCOMPAT_REVISION   1103
-// CHECKME: we may lower this down, if we find that earlier versions may still
-// load new savedgames
-#define SVG_VERSION_FWCOMPAT_MAJOR      3
-#define SVG_VERSION_FWCOMPAT_MINOR      2
-#define SVG_VERSION_FWCOMPAT_RELEASE    1
-#define SVG_VERSION_FWCOMPAT_REVISION   1111
-
 // Current engine version
 AGS::Common::Version EngineVersion;
-// Lowest savedgame version, accepted by this engine
-AGS::Common::Version SavedgameLowestBackwardCompatVersion;
-// Lowest engine version, which would accept current savedgames
-AGS::Common::Version SavedgameLowestForwardCompatVersion;
 
 void main_init(int argc, char*argv[])
 {
@@ -102,8 +86,6 @@ void main_init(int argc, char*argv[])
 #if defined (BUILD_STR)
     EngineVersion.BuildInfo = BUILD_STR;
 #endif
-    SavedgameLowestBackwardCompatVersion = Version(SVG_VERSION_BWCOMPAT_MAJOR, SVG_VERSION_BWCOMPAT_MINOR, SVG_VERSION_BWCOMPAT_RELEASE, SVG_VERSION_BWCOMPAT_REVISION);
-    SavedgameLowestForwardCompatVersion = Version(SVG_VERSION_FWCOMPAT_MAJOR, SVG_VERSION_FWCOMPAT_MINOR, SVG_VERSION_FWCOMPAT_RELEASE, SVG_VERSION_FWCOMPAT_REVISION);
 
     platform = AGSPlatformDriver::GetDriver();
     platform->SetCommandArgs(argv, argc);

diff --git a/Engine/main/main.h b/Engine/main/main.h
@@ -23,10 +23,6 @@
 
 // Current engine version
 extern AGS::Common::Version EngineVersion;
-// Lowest savedgame version, accepted by this engine
-extern AGS::Common::Version SavedgameLowestBackwardCompatVersion;
-// Lowest engine version, which would accept current savedgames
-extern AGS::Common::Version SavedgameLowestForwardCompatVersion;
 
 //=============================================================================