From f5b6fc1d8a3629aa9080f3f7c74f4e35c8ef9a3f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 5 Jul 2025 08:33:19 +0300 Subject: [PATCH 73/73] city_reset_foodbox(): Drop obsolete 'shrink' parameter All callers expect it to be TRUE. See RM #1571 Signed-off-by: Marko Lindqvist --- server/cityturn.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/server/cityturn.c b/server/cityturn.c index 1427851960..59313e9903 100644 --- a/server/cityturn.c +++ b/server/cityturn.c @@ -897,17 +897,14 @@ int city_shrink_granary_savings(const struct city *pcity) } /**********************************************************************//** - Reset the foodbox, usually when a city grows or shrinks. - By default it is reset to zero, but this can be increased by Growth_Food - of Shrink_Food effects. + Reset the foodbox, usually when a city shrinks. + By default it is reset to zero, but this can be increased by + Shrink_Food effects. Usually this should be called before the city changes size. **************************************************************************/ -static void city_reset_foodbox(struct city *pcity, int new_size, - bool shrink) +static void city_reset_foodbox(struct city *pcity, int new_size) { - int savings_pct = ( shrink - ? city_shrink_granary_savings(pcity) - : city_growth_granary_savings(pcity)); + int savings_pct = city_shrink_granary_savings(pcity); pcity->food_stock = (city_granary_size(new_size) * savings_pct) / 100; } @@ -1142,7 +1139,7 @@ static void city_populate(struct city *pcity, struct player *nationality) } if (city_exist(saved_id)) { - city_reset_foodbox(pcity, city_size_get(pcity), TRUE); + city_reset_foodbox(pcity, city_size_get(pcity)); } return; @@ -1159,7 +1156,7 @@ static void city_populate(struct city *pcity, struct player *nationality) _("Famine destroys %s entirely."), city_link(pcity)); } - city_reset_foodbox(pcity, city_size_get(pcity) - 1, TRUE); + city_reset_foodbox(pcity, city_size_get(pcity) - 1); if (city_reduce_size(pcity, 1, NULL, "famine")) { pcity->had_famine = TRUE; } -- 2.47.2