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

Codechange: move client name in settings to std::string

Browse Source
This commit is contained in:
rubidium42
2021-04-27 22:02:40 +02:00
committed by rubidium42
parent 02fdb5b210
commit 16437b7c0d
11 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/network_gui.cpp
View File

@@ -462,7 +462,7 @@ public:
this->FinishInitNested(WN_NETWORK_WINDOW_GAME);
this->querystrings[WID_NG_CLIENT] = &this->name_editbox;
this->name_editbox.text.Assign(_settings_client.network.client_name);
this->name_editbox.text.Assign(_settings_client.network.client_name.c_str());
this->querystrings[WID_NG_FILTER] = &this->filter_editbox;
this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR;
@@ -820,7 +820,7 @@ public:
case WID_NG_CLIENT:
/* Validation of the name will happen once the user tries to join or start a game, as getting
* error messages while typing (e.g. when you clear the name) defeats the purpose of the check. */
strecpy(_settings_client.network.client_name, this->name_editbox.text.buf, lastof(_settings_client.network.client_name));
_settings_client.network.client_name = this->name_editbox.text.buf;
break;
}
}
@@ -2207,11 +2207,12 @@ public:
}
case WID_CL_CLIENT_NAME_EDIT: {
if (!NetworkValidateClientName(str)) break;
std::string client_name(str);
if (!NetworkValidateClientName(client_name)) break;
uint index;
GetSettingFromName("network.client_name", &index);
SetSettingValue(index, str);
SetSettingValue(index, client_name.c_str());
this->InvalidateData();
break;
}