From 11f76692b69183d840ff93c283b2208ac5fe9db2 Mon Sep 17 00:00:00 2001 From: Dino Date: Sun, 13 Jul 2025 21:37:08 -0400 Subject: [PATCH] #1605 make help -> units show >1 tech requirement --- client/gui-gtk-3.22/helpdlg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index 9a2a7a6918..75842a7233 100644 --- a/client/gui-gtk-3.22/helpdlg.c +++ b/client/gui-gtk-3.22/helpdlg.c @@ -1011,8 +1011,21 @@ static void help_update_unit_type(const struct help_item *pitem, helptext_unit_upkeep_str(utype)); sprintf(buf, "%d", (int)sqrt((double)utype->vision_radius_sq)); gtk_label_set_text(GTK_LABEL(help_ulabel[3][4]), buf); - gtk_label_set_text(GTK_LABEL(help_ulabel[4][1]), - advance_name_translation(utype_primary_tech_req(utype))); + + /* requirements */ + buf[0] = '\0'; + // see if any reqs + if (utype->build_reqs.size == 0) { + gtk_label_set_text(GTK_LABEL(help_ulabel[4][1]), "None"); + } else { + // iterate all the reqs, building the buf str + unit_tech_reqs_iterate(utype, padv) { + cat_snprintf(buf, sizeof(buf), "%s, ", advance_name_translation(padv)); + } unit_tech_reqs_iterate_end; + buf[strlen(buf)-2] = '\0'; /* trim off the extra ", " at the end */ + gtk_label_set_text(GTK_LABEL(help_ulabel[4][1]), buf); + } + /* create_tech_tree(help_improvement_tree, 0, advance_number(utype->require_advance), 3);*/ if (U_NOT_OBSOLETED == utype->obsoleted_by) { gtk_label_set_text(GTK_LABEL(help_ulabel[4][4]), skip_intl_qualifier_prefix(REQ_LABEL_NONE)); -- 2.31.0