From 6c4f1dabf4365882cd895b149e278a1b7dde9593 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 3 Sep 2023 07:07:14 +0300 Subject: [PATCH 21/21] Bump version number to 3.2.91 See osdn #48572 Signed-off-by: Marko Lindqvist --- fc_version | 4 ++-- server/savegame/savecompat.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/fc_version b/fc_version index e44ea2f046..f6c39e4d81 100755 --- a/fc_version +++ b/fc_version @@ -7,8 +7,8 @@ MAJOR_VERSION="3" MINOR_VERSION="2" -PATCH_VERSION="90" -EMERGENCY_VERSION="5" +PATCH_VERSION="91" +EMERGENCY_VERSION="" VERSION_LABEL="-dev" # Type is either "development" or "stable" diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index 55feee466b..0af485ef76 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -2478,11 +2478,10 @@ static void compat_load_dev(struct loaddata *loading) /* Check status and return if not OK (sg_success FALSE). */ sg_check_ret(); - log_debug("Upgrading data between development revisions"); + log_verbose("Upgrading data between development revisions"); - if (!secfile_lookup_int(loading->file, &game_version, "scenario.game_version")) { - game_version = 2060000; - } + sg_failure_ret(secfile_lookup_int(loading->file, &game_version, "scenario.game_version"), + "No save version found"); #ifdef FREECIV_DEV_SAVE_COMPAT_3_2 @@ -2996,7 +2995,7 @@ static void compat_load_dev(struct loaddata *loading) #ifdef FREECIV_DEV_SAVE_COMPAT_3_3 if (game_version < 3029100) { - /* Before version number bump to 3.2.91 */ + /* Before version number bump to 3.2.91, September 2023 */ { const char *str = secfile_lookup_str_default(loading->file, NULL, @@ -3234,6 +3233,11 @@ static void compat_load_dev(struct loaddata *loading) } /* Version < 3.2.91 */ + if (game_version < 3029200) { + /* Before version number bump to 3.2.92 */ + + } /* Version < 3.2.92 */ + #endif /* FREECIV_DEV_SAVE_COMPAT_3_3 */ } -- 2.40.1