From cd1b6fdd8ab2cb181213042d9f803f54eaef9f3f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 6 Oct 2026 19:20:00 +0300 Subject: [PATCH 91/91] map_generate_fair_islands(): Fix set-but-unused warning on ndebug builds See RM #2343 Signed-off-by: Marko Lindqvist --- server/generator/mapgen.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/generator/mapgen.c b/server/generator/mapgen.c index 803d2cbe3d..fa6483de7a 100644 --- a/server/generator/mapgen.c +++ b/server/generator/mapgen.c @@ -3411,20 +3411,29 @@ static bool map_generate_fair_islands(void) int playermass, islandmass1 , islandmass2, islandmass3; int min_island_size = wld.map.server.tinyisles ? 1 : 2; int players_per_island = 1; - int teams_num = 0, team_players_num = 0, single_players_num = 0; + int teams_num = 0, team_players_num = 0; int i, iter = CLIP(1, 100000 / map_num_tiles(), 10); bool done = FALSE; +#if !defined(FREECIV_NDEBUG) || defined(FREECIV_DEBUG) + int single_players_num = 0; +#endif + teams_iterate(pteam) { i = player_list_size(team_members(pteam)); + fc_assert(0 < i); - if (i == 1) { - single_players_num++; - } else { + + if (i != 1) { teams_num++; team_players_num += i; +#if !defined(FREECIV_NDEBUG) || defined(FREECIV_DEBUG) + } else { + single_players_num++; +#endif } } teams_iterate_end; + fc_assert(team_players_num + single_players_num == player_count()); /* Take in account the 'startpos' setting. */ -- 2.53.0