From 940184ce18af161c4baa20d7f5b9418cc16f61f4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 9 Oct 2022 19:29:19 +0300 Subject: [PATCH 48/48] Fix dead assignment of 'drawposx' in show_small_citybar() See osdn #45813 Signed-off-by: Marko Lindqvist --- client/mapview_common.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/mapview_common.c b/client/mapview_common.c index 53aef4937c..be87c6dbee 100644 --- a/client/mapview_common.c +++ b/client/mapview_common.c @@ -2206,26 +2206,25 @@ static void show_small_citybar(struct canvas *pcanvas, drawposx = canvas_x; drawposx -= total_width / 2; canvas_put_text(pcanvas, drawposx / map_zoom, canvas_y / map_zoom, - FONT_CITY_NAME, - get_color(tileset, COLOR_MAPVIEW_CITYTEXT), name); + FONT_CITY_NAME, + get_color(tileset, COLOR_MAPVIEW_CITYTEXT), name); drawposx += name_rect.w; if (gui_options.draw_city_growth && can_see_inside) { drawposx += spacer_width; canvas_put_text(pcanvas, drawposx / map_zoom, - (canvas_y + total_height - growth_rect.h) / map_zoom, - FONT_CITY_PROD, - get_color(tileset, growth_color), growth); + (canvas_y + total_height - growth_rect.h) / map_zoom, + FONT_CITY_PROD, + get_color(tileset, growth_color), growth); drawposx += growth_rect.w; } if (gui_options.draw_city_trade_routes && can_see_inside) { drawposx += spacer_width; canvas_put_text(pcanvas, drawposx / map_zoom, - (canvas_y + total_height - trade_routes_rect.h) / map_zoom, - FONT_CITY_PROD, - get_color(tileset, trade_routes_color), trade_routes); - drawposx += trade_routes_rect.w; + (canvas_y + total_height - trade_routes_rect.h) / map_zoom, + FONT_CITY_PROD, + get_color(tileset, trade_routes_color), trade_routes); } canvas_y += total_height + 3; @@ -2233,6 +2232,7 @@ static void show_small_citybar(struct canvas *pcanvas, *width = MAX(*width, total_width); *height += total_height + 3; } + if (gui_options.draw_city_productions && can_see_inside) { get_city_mapview_production(pcity, prod, sizeof(prod)); get_text_size(&prod_rect.w, &prod_rect.h, FONT_CITY_PROD, prod); -- 2.35.1