From eed96833dac60737c6983e045b687f30e78c7f82 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 26 Mar 2023 02:20:50 +0200 Subject: [PATCH 43/43] Fix "unused entry" warnings about "free_bulbs" with savegame2 Do not insert "free_bulbs" entries in savecompat, when the save in question is a savegame2 one. See osdn #46188 Signed-off-by: Marko Lindqvist --- server/savegame/savecompat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index 31c282adcd..8b3cdbfda9 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -2243,7 +2243,7 @@ static void compat_load_030200(struct loaddata *loading, secfile_replace_int(loading->file, set_count, "settings.set_count"); } - { + if (format_class != SAVEGAME_2) { /* Replace got_tech[_multi] bools on free_bulbs integers. */ /* Older savegames had a bug that got_tech_multi was not saved. */ count = secfile_lookup_int_default(loading->file, 0, "research.count"); -- 2.39.2