From 7efd40c9578915dc6b722df5776f2ec840679e4d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 2 Sep 2023 16:03:55 +0300 Subject: [PATCH 14/14] sdl2 theme: Rename "unkeep_coin" icon as "upkeep_coin" See osdn #48542 Signed-off-by: Marko Lindqvist --- client/gui-sdl2/gui_tilespec.c | 6 +++--- data/themes/gui-sdl2/human/icons.tspec | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/client/gui-sdl2/gui_tilespec.c b/client/gui-sdl2/gui_tilespec.c index f1acc6ba99..4a19a85191 100644 --- a/client/gui-sdl2/gui_tilespec.c +++ b/client/gui-sdl2/gui_tilespec.c @@ -182,9 +182,9 @@ void tilespec_setup_city_icons(void) load_city_icon_surface(spr, big_colb, "city.colb"); load_city_icon_surface(spr, pBIG_Face, "city.red_face"); load_city_icon_surface(spr, big_coin_corr, "city.dark_coin"); - load_city_icon_surface(spr, big_coin_upkeep, "city.unkeep_coin"); + load_city_icon_surface(spr, big_coin_upkeep, "city.upkeep_coin"); - /* small icon */ + /* Small icon */ load_city_icon_surface(spr, food, "city.small_food"); load_city_icon_surface(spr, shield, "city.small_shield"); load_city_icon_surface(spr, trade, "city.small_trade"); @@ -217,7 +217,7 @@ void tilespec_setup_city_icons(void) /* ================================================================= */ - /* force reload citizens icons */ + /* Force reload citizens icons */ icons->style = 999; } diff --git a/data/themes/gui-sdl2/human/icons.tspec b/data/themes/gui-sdl2/human/icons.tspec index cb0c6f85bb..22d9841d59 100644 --- a/data/themes/gui-sdl2/human/icons.tspec +++ b/data/themes/gui-sdl2/human/icons.tspec @@ -24,10 +24,9 @@ pixel_border = 1 tiles = { "row", "column", "tag" -; used by all city styles +; Used by all city styles 0, 0, "city.pollution" - } [grid_city_resource] @@ -50,8 +49,7 @@ tiles = { "row", "column", "tag" 0, 5, "city.colb" 1, 3, "city.red_face" 1, 4, "city.dark_coin" - 1, 5, "city.unkeep_coin" - + 1, 5, "city.upkeep_coin" } [grid_city_small_resource] @@ -70,5 +68,4 @@ tiles = { "row", "column", "tag" 1, 0, "city.small_lux" 1, 1, "city.small_coin" 1, 2, "city.small_colb" - } -- 2.40.1