From 88da23e77aeb0ef4f8a03408822d4634e214bf4b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 11 Jun 2023 05:38:05 +0300 Subject: [PATCH 21/21] Correct version numbers in sg_regr() uses to decimal Format "030?0?00" was being used, where the leading zero made compiler to consider them octals. See osdn #48212 Signed-off-by: Marko Lindqvist --- server/savegame/savecompat.h | 2 ++ server/savegame/savegame2.c | 2 +- server/savegame/savegame3.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/savegame/savecompat.h b/server/savegame/savecompat.h index 5bc5a77cc8..3df9364583 100644 --- a/server/savegame/savecompat.h +++ b/server/savegame/savecompat.h @@ -179,6 +179,8 @@ struct loaddata { sg_check_ret_val(_val); \ } +/* Resist urge to write version numbers with leading zero; "030?0?00", + * as that makes compiler to consider them octal. */ #define sg_regr(fixversion, message, ...) \ if (loading->full_version >= fixversion) { \ log_sg(message, ## __VA_ARGS__); \ diff --git a/server/savegame/savegame2.c b/server/savegame/savegame2.c index 99328e0962..54eddd2146 100644 --- a/server/savegame/savegame2.c +++ b/server/savegame/savegame2.c @@ -5306,7 +5306,7 @@ static void sg_load_sanitycheck(struct loaddata *loading) techs = recalculate_techs_researched(presearch); if (presearch->techs_researched != techs) { - sg_regr(03000300, + sg_regr(3000300, _("%s had finished researches count wrong."), research_name_translation(presearch)); presearch->techs_researched = techs; diff --git a/server/savegame/savegame3.c b/server/savegame/savegame3.c index 0cd96d2914..14dcb08d84 100644 --- a/server/savegame/savegame3.c +++ b/server/savegame/savegame3.c @@ -7718,7 +7718,7 @@ static void sg_load_sanitycheck(struct loaddata *loading) techs = recalculate_techs_researched(presearch); if (presearch->techs_researched != techs) { - sg_regr(03000300, + sg_regr(3000300, _("%s had finished researches count wrong."), research_name_translation(presearch)); presearch->techs_researched = techs; -- 2.39.2