From 2baa31fc8ba2650ce17f903f277777ff6f2ebebe Mon Sep 17 00:00:00 2001 From: Dino Date: Thu, 13 Nov 2025 22:38:33 -0500 Subject: [PATCH] #1737 - improve reporting of appearing/disappearing extras --- server/srv_main.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/server/srv_main.c b/server/srv_main.c index d17084dbf1..b9454e442c 100644 --- a/server/srv_main.c +++ b/server/srv_main.c @@ -1714,16 +1714,16 @@ static void end_turn(void) update_tile_knowledge(ptile); - if (tile_owner(ptile) != NULL) { - /* TODO: Should notify players nearby even when borders disabled, - * like in case of barbarian uprising */ - notify_player(tile_owner(ptile), ptile, - E_SPONTANEOUS_EXTRA, ftc_server, - /* TRANS: Small Fish disappears from (32, 72). */ - _("%s disappears from %s."), - extra_name_translation(pextra), - tile_link(ptile)); - } + players_iterate(aplayer) { + if (tile_is_seen(ptile, aplayer)) { + notify_player(aplayer, ptile, + E_SPONTANEOUS_EXTRA, ftc_server, + /* TRANS: Small Fish disappears from (32, 72). */ + _("%s disappears from %s."), + extra_name_translation(pextra), + tile_link(ptile)); + } + } players_iterate_end; /* Activities at the target tile and its neighbors may now * be illegal because of present reqs. */ @@ -1742,16 +1742,16 @@ static void end_turn(void) update_tile_knowledge(ptile); - if (tile_owner(ptile) != NULL) { - /* TODO: Should notify players nearby even when borders disabled, - * like in case of barbarian uprising */ - notify_player(tile_owner(ptile), ptile, - E_SPONTANEOUS_EXTRA, ftc_server, - /* TRANS: Small Fish appears to (32, 72). */ - _("%s appears to %s."), - extra_name_translation(pextra), - tile_link(ptile)); - } + players_iterate(aplayer) { + if (tile_is_seen(ptile, aplayer)) { + notify_player(aplayer, ptile, + E_SPONTANEOUS_EXTRA, ftc_server, + /* TRANS: Small Fish appears to (32, 72). */ + _("%s appears to %s."), + extra_name_translation(pextra), + tile_link(ptile)); + } + } players_iterate_end; /* Activities at the target tile and its neighbors may now * be illegal because of !present reqs. */ -- 2.31.0