From 0740420c65536842665112288e381c94f514a303 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 05:06:29 +0200 Subject: [PATCH 2/2] Add macro FREECIV_DEV_SAVE_COMPAT_3_3 It's to be used where the savegame compatibility code is specific to 3.3 development. See osdn #47394 Signed-off-by: Marko Lindqvist --- configure.ac | 2 ++ server/savegame/savecompat.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index b0371d9974..e722afa125 100644 --- a/configure.ac +++ b/configure.ac @@ -408,6 +408,8 @@ AC_ARG_ENABLE([dev-save-compat], AS_IF([test $dev_save_compat != 0], [AC_DEFINE([FREECIV_DEV_SAVE_COMPAT], [1], [Development version save game compatibility]) + AC_DEFINE([FREECIV_DEV_SAVE_COMPAT_3_3], [1], + [Development version save game compatibility - 3.3 development]) AC_DEFINE([FREECIV_DEV_SAVE_COMPAT_3_2], [1], [Development version save game compatibility - 3.2 development])]) diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index 2585b9facb..fe8b76f0c5 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -2834,6 +2834,15 @@ static void compat_load_dev(struct loaddata *loading) } /* Version < 3.1.93 */ #endif /* FREECIV_DEV_SAVE_COMPAT_3_2 */ + +#ifdef FREECIV_DEV_SAVE_COMPAT_3_3 + + if (game_version < 3029100) { + /* Before version number bump to 3.2.91 */ + + } /* Version < 3.2.91 */ + +#endif /* FREECIV_DEV_SAVE_COMPAT_3_3 */ } /************************************************************************//** -- 2.39.1