mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use GetWidgetString for goal, league and story windows. (#13700)

pull/13702/head
Peter Nelson 2025-03-02 18:33:11 +00:00 committed by GitHub
parent 913eadd6b0
commit 2f75f3d147
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/goal_gui.cpp
View File

@ -51,16 +51,14 @@ struct GoalListWindow : public Window {
this->OnInvalidateData(0);
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
if (widget != WID_GOAL_CAPTION) return;
if (widget != WID_GOAL_CAPTION) return this->Window::GetWidgetString(widget, stringid);
if (this->window_number == CompanyID::Invalid()) {
SetDParam(0, STR_GOALS_SPECTATOR_CAPTION);
} else {
SetDParam(0, STR_GOALS_CAPTION);
SetDParam(1, this->window_number);
return GetString(stringid, STR_GOALS_SPECTATOR_CAPTION);
}
return GetString(stringid, STR_GOALS_CAPTION, this->window_number);
}
void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
@ -348,20 +346,20 @@ struct GoalQuestionWindow : public Window {
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_GQ_BUTTON_1:
SetDParam(0, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[0]);
break;
return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[0]);
case WID_GQ_BUTTON_2:
SetDParam(0, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[1]);
break;
return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[1]);
case WID_GQ_BUTTON_3:
SetDParam(0, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[2]);
break;
return GetString(stringid, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[2]);
default:
return this->Window::GetWidgetString(widget, stringid);
}
}

7
src/league_gui.cpp
View File

@ -296,10 +296,11 @@ public:
this->InitNested(table);
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
if (widget != WID_SLT_CAPTION) return;
SetDParamStr(0, this->title);
if (widget != WID_SLT_CAPTION) return this->Window::GetWidgetString(widget, stringid);
return GetString(stringid, this->title);
}
void OnPaint() override

16
src/story_gui.cpp
View File

@ -637,22 +637,22 @@ public:
}
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_SB_SEL_PAGE: {
StoryPage *page = this->GetSelPage();
SetDParamStr(0, page != nullptr && !page->title.empty() ? page->title : this->selected_generic_title);
break;
return GetString(stringid, page != nullptr && !page->title.empty() ? page->title : this->selected_generic_title);
}
case WID_SB_CAPTION:
if (this->window_number == CompanyID::Invalid()) {
SetDParam(0, STR_STORY_BOOK_SPECTATOR_CAPTION);
} else {
SetDParam(0, STR_STORY_BOOK_CAPTION);
SetDParam(1, this->window_number);
return GetString(stringid, STR_STORY_BOOK_SPECTATOR_CAPTION);
}
break;
return GetString(stringid, STR_STORY_BOOK_CAPTION, this->window_number);
default:
return this->Window::GetWidgetString(widget, stringid);
}
}