From 24aa4627fd810e076335bf43195fd6485315d3cf Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 2 Mar 2025 22:46:01 +0000 Subject: [PATCH] Codechange: Drop STR_JUST_STRING for goal window. Missed from previous changes. --- src/goal_gui.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp index c9184f67ca..b30920d1c7 100644 --- a/src/goal_gui.cpp +++ b/src/goal_gui.cpp @@ -350,13 +350,13 @@ struct GoalQuestionWindow : public Window { { switch (widget) { case WID_GQ_BUTTON_1: - return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[0]); + return GetString(STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[0]); case WID_GQ_BUTTON_2: - return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[1]); + return GetString(STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[1]); case WID_GQ_BUTTON_3: - return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[2]); + return GetString(STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[2]); default: return this->Window::GetWidgetString(widget, stringid); @@ -416,16 +416,16 @@ struct NestedGoalWidgets { NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetFill(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GQ_BUTTONS), NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(85, WidgetDimensions::unscaled.hsep_wide, 85), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetStringTip(STR_JUST_STRING), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetFill(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(65, WidgetDimensions::unscaled.hsep_wide, 65), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetStringTip(STR_JUST_STRING), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_2), SetStringTip(STR_JUST_STRING), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_2), SetFill(1, 0), EndContainer(), NWidget(NWID_HORIZONTAL, NWidContainerFlag::EqualSize), SetPIP(25, WidgetDimensions::unscaled.hsep_wide, 25), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetStringTip(STR_JUST_STRING), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_2), SetStringTip(STR_JUST_STRING), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_3), SetStringTip(STR_JUST_STRING), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_1), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_2), SetFill(1, 0), + NWidget(WWT_PUSHTXTBTN, btn_colour, WID_GQ_BUTTON_3), SetFill(1, 0), EndContainer(), EndContainer(), EndContainer(),