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

Codechange: Use GetWidgetString for network windows. (#13699)

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

8
src/network/network_chat_gui.cpp
View File

@ -359,13 +359,15 @@ struct NetworkChatWindow : public Window {
return pt;
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
if (widget != WID_NC_DESTINATION) return;
if (widget != WID_NC_DESTINATION) return this->Window::GetWidgetString(widget, stringid);
if (this->dtype == DESTTYPE_CLIENT) {
SetDParamStr(0, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name);
return GetString(stringid, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name);
}
return GetString(stringid);
}
void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override

7
src/network/network_content_gui.cpp
View File

@ -66,12 +66,13 @@ struct ContentTextfileWindow : public TextfileWindow {
}
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
if (widget == WID_TF_CAPTION) {
SetDParam(0, this->GetTypeString());
SetDParamStr(1, this->ci->name);
return GetString(stringid, this->GetTypeString(), this->ci->name);
}
return this->Window::GetWidgetString(widget, stringid);
}
};

49
src/network/network_gui.cpp
View File

@ -977,20 +977,20 @@ struct NetworkStartServerWindow : public Window {
this->SetFocusedWidget(WID_NSS_GAMENAME);
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_NSS_CONNTYPE_BTN:
SetDParam(0, STR_NETWORK_SERVER_VISIBILITY_LOCAL + _settings_client.network.server_game_type);
break;
return GetString(stringid, STR_NETWORK_SERVER_VISIBILITY_LOCAL + _settings_client.network.server_game_type);
case WID_NSS_CLIENTS_TXT:
SetDParam(0, _settings_client.network.max_clients);
break;
return GetString(stringid, _settings_client.network.max_clients);
case WID_NSS_COMPANIES_TXT:
SetDParam(0, _settings_client.network.max_companies);
break;
return GetString(stringid, _settings_client.network.max_companies);
default:
return this->Window::GetWidgetString(widget, stringid);
}
}
@ -1675,38 +1675,32 @@ public:
this->vscroll->SetCapacityFromWidget(this, WID_CL_MATRIX);
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_CL_SERVER_NAME:
SetDParamStr(0, _network_server ? _settings_client.network.server_name : _network_server_name);
break;
return GetString(stringid, _network_server ? _settings_client.network.server_name : _network_server_name);
case WID_CL_SERVER_VISIBILITY:
SetDParam(0, STR_NETWORK_SERVER_VISIBILITY_LOCAL + _settings_client.network.server_game_type);
break;
return GetString(stringid, STR_NETWORK_SERVER_VISIBILITY_LOCAL + _settings_client.network.server_game_type);
case WID_CL_SERVER_INVITE_CODE: {
static std::string empty = {};
SetDParamStr(0, _network_server_connection_type == CONNECTION_TYPE_UNKNOWN ? empty : _network_server_invite_code);
break;
return GetString(stringid, _network_server_connection_type == CONNECTION_TYPE_UNKNOWN ? std::string{} : _network_server_invite_code);
}
case WID_CL_SERVER_CONNECTION_TYPE:
SetDParam(0, STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_UNKNOWN + _network_server_connection_type);
break;
return GetString(stringid, STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_UNKNOWN + _network_server_connection_type);
case WID_CL_CLIENT_NAME: {
const NetworkClientInfo *own_ci = NetworkClientInfo::GetByClientID(_network_own_client_id);
SetDParamStr(0, own_ci != nullptr ? own_ci->client_name : _settings_client.network.client_name);
break;
return GetString(stringid, own_ci != nullptr ? own_ci->client_name : _settings_client.network.client_name);
}
case WID_CL_CLIENT_COMPANY_COUNT:
SetDParam(0, NetworkClientInfo::GetNumItems());
SetDParam(1, Company::GetNumItems());
SetDParam(2, NetworkMaxCompaniesAllowed());
break;
return GetString(stringid, NetworkClientInfo::GetNumItems(), Company::GetNumItems(), NetworkMaxCompaniesAllowed());
default:
return this->Window::GetWidgetString(widget, stringid);
}
}
@ -2234,13 +2228,14 @@ struct NetworkAskRelayWindow : public Window {
this->SetDirty();
}
void SetStringParameters(WidgetID widget) const override
std::string GetWidgetString(WidgetID widget, StringID stringid) const override
{
switch (widget) {
case WID_NAR_TEXT:
SetDParamStr(0, this->server_connection_string);
SetDParamStr(1, this->relay_connection_string);
break;
return GetString(stringid, this->server_connection_string, this->relay_connection_string);
default:
return this->Window::GetWidgetString(widget, stringid);
}
}