Skip to content

Commit 2dbc17f

Browse files
committed
ui: clear storage yard state icons
1 parent b41633e commit 2dbc17f

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

src/window/window_info_storageyard.cpp

+12-8
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,19 @@ void info_window_storageyard::draw_background(object_info *c) {
7272

7373
const resource_list &resources = city_resource_get_available();
7474
int gidx = 0;
75+
auto _icon = [] (int idx) { bstring32 id_icon; id_icon.printf("good%u_icon", idx); return id_icon; };
76+
auto _text = [] (int idx) { bstring32 id_text; id_text.printf("good%u_text", idx); return id_text; };
77+
78+
for (int i = 0; i < 8; ++i) {
79+
ui[_icon(gidx)].image(RESOURCE_NONE);
80+
ui[_text(gidx)] = "";
81+
}
82+
7583
for (const auto &r : resources) {
76-
e_resource resource = r.type;
77-
int loads = warehouse->amount(resource);
78-
if (loads) {
79-
bstring32 id_icon; id_icon.printf("good%u_icon", gidx);
80-
bstring32 id_text; id_text.printf("good%u_text", gidx);
81-
82-
ui[id_icon].image(resource);
83-
ui[id_text].text_var("%u %s", loads, ui::str(23, resource));
84+
int loads = warehouse->amount(r.type);
85+
if (loads) {
86+
ui[_icon(gidx)].image(r.type);
87+
ui[_text(gidx)].text_var("%u %s", loads, ui::str(23, r.type));
8488
++gidx;
8589
}
8690
}

0 commit comments

Comments
 (0)