From d0ff5c2879dd17e0e25f5ec5650938fb52f5fb9b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 22 Sep 2026 16:29:42 +0300 Subject: [PATCH 71/71] Move resource_by_identifier() to savegame2.c ..and make it static. See RM #2276 Signed-off-by: Marko Lindqvist --- server/savegame/savecompat.c | 15 --------------- server/savegame/savecompat.h | 2 -- server/savegame/savegame2.c | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/server/savegame/savecompat.c b/server/savegame/savecompat.c index fe3282919d..c512e56e1b 100644 --- a/server/savegame/savecompat.c +++ b/server/savegame/savecompat.c @@ -328,21 +328,6 @@ struct extra_type *special_extra_get(int spe) return nullptr; } -/************************************************************************//** - Return the resource type matching the identifier, or nullptr - when none matches. -****************************************************************************/ -struct extra_type *resource_by_identifier(const char identifier) -{ - extra_type_by_cause_iterate(EC_RESOURCE, presource) { - if (presource->data.resource->id_old_save == identifier) { - return presource; - } - } extra_type_by_cause_iterate_end; - - return nullptr; -} - /* ======================================================================= * Compatibility functions for loading a game. * ======================================================================= */ diff --git a/server/savegame/savecompat.h b/server/savegame/savecompat.h index e963f949be..9749ec61e2 100644 --- a/server/savegame/savecompat.h +++ b/server/savegame/savecompat.h @@ -211,8 +211,6 @@ enum tile_special_type special_by_rule_name(const char *name); const char *special_rule_name(enum tile_special_type type); struct extra_type *special_extra_get(int spe); -struct extra_type *resource_by_identifier(const char identifier); - enum ai_level ai_level_convert(int old_level); enum barbarian_type barb_type_convert(int old_type); diff --git a/server/savegame/savegame2.c b/server/savegame/savegame2.c index a4a51be390..626fb17846 100644 --- a/server/savegame/savegame2.c +++ b/server/savegame/savegame2.c @@ -1328,6 +1328,21 @@ static void sg_roads_set_bv(bv_extras *extras, char ch, struct road_type **idx) } } +/************************************************************************//** + Return the resource type matching the identifier, or nullptr + when none matches. +****************************************************************************/ +static struct extra_type *resource_by_identifier(const char identifier) +{ + extra_type_by_cause_iterate(EC_RESOURCE, presource) { + if (presource->data.resource->id_old_save == identifier) { + return presource; + } + } extra_type_by_cause_iterate_end; + + return nullptr; +} + /************************************************************************//** Return the resource for the given identifier. ****************************************************************************/ -- 2.53.0