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

Codechange: [Network] Use std::string to determine an unique name for clients

Browse Source
This commit is contained in:
rubidium42
2021-05-29 20:22:41 +02:00
committed by rubidium42
parent 806f78aa04
commit e3c9ed4d15
3 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network_client.cpp
View File

@@ -1358,9 +1358,8 @@ void NetworkUpdateClientName(const std::string &client_name)
MyClient::SendSetName(client_name);
} else {
/* Copy to a temporary buffer so no #n gets added after our name in the settings when there are duplicate names. */
char temporary_name[NETWORK_CLIENT_NAME_LENGTH];
strecpy(temporary_name, client_name.c_str(), lastof(temporary_name));
if (NetworkFindName(temporary_name, lastof(temporary_name))) {
std::string temporary_name = client_name;
if (NetworkMakeClientNameUnique(temporary_name)) {
NetworkTextMessage(NETWORK_ACTION_NAME_CHANGE, CC_DEFAULT, false, ci->client_name, temporary_name);
ci->client_name = temporary_name;
NetworkUpdateClientInfo(CLIENT_ID_SERVER);