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

Fix: Network relay question used string parameters unconventionally. (#13734)

pull/13736/head
Peter Nelson 2025-03-04 00:25:15 +00:00 committed by GitHub
parent ed65fea7dd
commit 4e485cd083
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/network/network_gui.cpp
View File

@ -2209,14 +2209,14 @@ struct NetworkAskRelayWindow : public Window {
void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
{ {
if (widget == WID_NAR_TEXT) { if (widget == WID_NAR_TEXT) {
size = GetStringBoundingBox(STR_NETWORK_ASK_RELAY_TEXT); size = GetStringBoundingBox(GetString(STR_NETWORK_ASK_RELAY_TEXT, this->server_connection_string, this->relay_connection_string));
} }
} }
void DrawWidget(const Rect &r, WidgetID widget) const override void DrawWidget(const Rect &r, WidgetID widget) const override
{ {
if (widget == WID_NAR_TEXT) { if (widget == WID_NAR_TEXT) {
DrawStringMultiLine(r, STR_NETWORK_ASK_RELAY_TEXT, TC_FROMSTRING, SA_CENTER); DrawStringMultiLine(r, GetString(STR_NETWORK_ASK_RELAY_TEXT, this->server_connection_string, this->relay_connection_string), TC_FROMSTRING, SA_CENTER);
} }
} }
@ -2228,17 +2228,6 @@ struct NetworkAskRelayWindow : public Window {
this->SetDirty(); this->SetDirty();
} }
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_NAR_TEXT:
return GetString(stringid, this->server_connection_string, this->relay_connection_string);
default:
return this->Window::GetWidgetString(widget, stringid);
}
}
void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override
{ {
switch (widget) { switch (widget) {