games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Minor fixes and corrections to network-related code. No functionality

Browse Source 
changes.
This commit is contained in:
Ivan Savenko
2024-02-12 18:57:20 +02:00
parent dc8d48a3b6
commit 7c34d48258
5 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/CServerHandler.cpp
View File

@ -163,7 +163,7 @@ void CServerHandler::threadRunNetwork()
logGlobal->info("Ending network thread");
}
void CServerHandler::resetStateForLobby(EStartMode mode, ESelectionScreen screen, EServerMode newServerMode, const std::vector<std::string> & names)
void CServerHandler::resetStateForLobby(EStartMode mode, ESelectionScreen screen, EServerMode newServerMode, const std::vector<std::string> & playerNames)
{
hostClientId = -1;
setState(EClientState::NONE);
@ -172,15 +172,15 @@ void CServerHandler::resetStateForLobby(EStartMode mode, ESelectionScreen screen
th = std::make_unique<CStopWatch>();
logicConnection.reset();
si = std::make_shared<StartInfo>();
playerNames.clear();
localPlayerNames.clear();
si->difficulty = 1;
si->mode = mode;
screenType = screen;
myNames.clear();
if(!names.empty()) //if have custom set of player names - use it
myNames = names;
localPlayerNames.clear();
if(!playerNames.empty()) //if have custom set of player names - use it
localPlayerNames = playerNames;
else
myNames.push_back(settings["general"]["playerName"].String());
localPlayerNames.push_back(settings["general"]["playerName"].String());
}
GlobalLobbyClient & CServerHandler::getGlobalLobby()
@ -421,7 +421,7 @@ void CServerHandler::sendClientConnecting() const
{
LobbyClientConnected lcc;
lcc.uuid = uuid;
lcc.names = myNames;
lcc.names = localPlayerNames;
lcc.mode = si->mode;
sendLobbyPack(lcc);
}