From b260d731e936ce5c726d0d8a2b86e7c5bafdb524 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 23 Nov 2022 21:17:30 +0200 Subject: [PATCH 16/16] handle_city_short_info(): Fix dead 'ptile' assignment See osdn #46104 Signed-off-by: Marko Lindqvist --- client/packhand.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/client/packhand.c b/client/packhand.c index 36f59aabcd..3a408065fe 100644 --- a/client/packhand.c +++ b/client/packhand.c @@ -1053,7 +1053,7 @@ void handle_traderoute_info(const struct packet_traderoute_info *packet) /**************************************************************************** A city-short-info packet is sent to tell us about any cities we can't see - the internals of. Most of the time this includes any cities owned by + the internals of. Most of the time this includes any cities owned by someone else. ****************************************************************************/ void handle_city_short_info(const struct packet_city_short_info *packet) @@ -1076,12 +1076,11 @@ void handle_city_short_info(const struct packet_city_short_info *packet) ptile = city_tile(pcity); if (NULL == ptile) { - /* invisible worked city */ + /* Invisible worked city */ city_list_remove(invisible.cities, pcity); city_is_new = TRUE; pcity->tile = pcenter; - ptile = pcenter; pcity->owner = powner; pcity->original = powner; @@ -1095,7 +1094,7 @@ void handle_city_short_info(const struct packet_city_short_info *packet) } } whole_map_iterate_end; } else if (city_owner(pcity) != powner) { - /* Remember what were the worked tiles. The server won't + /* Remember what were the worked tiles. The server won't * send to us again. */ city_tile_iterate_skip_free_worked(city_map_radius_sq_get(pcity), ptile, pworked, _index, _x, _y) { -- 2.35.1