games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merge pull request #4736 from Laserlicht/fix_8th_portal_summoning

Browse Source 
Fix multiple small issues
This commit is contained in:
Ivan Savenko
2024-10-07 22:19:17 +03:00
committed by GitHub
parent 25311b3464 9e67e9616b
commit 7694e2da4b
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/CServerHandler.cpp
View File

@@ -141,7 +141,12 @@ void CServerHandler::resetStateForLobby(EStartMode mode, ESelectionScreen screen
if(!playerNames.empty()) //if have custom set of player names - use it
localPlayerNames = playerNames;
else
localPlayerNames.push_back(settings["general"]["playerName"].String());
{
std::string playerName = settings["general"]["playerName"].String();
if(playerName == "Player")
playerName = CGI->generaltexth->translate("core.genrltxt.434");
localPlayerNames.push_back(playerName);
}
gameChat->resetMatchState();
lobbyClient->resetMatchState();