dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
This commit is contained in:
Jonathan G Rennison
2021-10-17 19:31:36 +01:00
parent b00d5e07d2 8372c679e3
commit 784fcbd1e7
14 changed files with 849 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network_gui.cpp
View File

@@ -2214,7 +2214,7 @@ public:
case WID_CL_SERVER_NAME_EDIT: {
if (!_network_server) break;
SetSettingValue(GetSettingFromName("network.server_name"), StrEmpty(str) ? "Unnamed Server" : str);
SetSettingValue(GetSettingFromName("network.server_name")->AsStringSetting(), StrEmpty(str) ? "Unnamed Server" : str);
this->InvalidateData();
break;
}
@@ -2223,7 +2223,7 @@ public:
std::string client_name(str);
if (!NetworkValidateClientName(client_name)) break;
SetSettingValue(GetSettingFromName("network.client_name"), client_name.c_str());
SetSettingValue(GetSettingFromName("network.client_name")->AsStringSetting(), client_name.c_str());
this->InvalidateData();
break;
}