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

Merge remote-tracking branch 'vcmi/develop' into lobby

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-20 23:01:49 +02:00
parent baa73f5433 6b760089a4
commit fc4ae3bd8c
192 changed files with 1119 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CServerHandler.cpp
View File

@ -277,6 +277,9 @@ void CServerHandler::onConnectionFailed(const std::string & errorMessage)
// retry - local server might be still starting up
logNetwork->debug("\nCannot establish connection. %s. Retrying...", errorMessage);
networkHandler->createTimer(*this, std::chrono::milliseconds(100));
nextClient = std::make_unique<CClient>();
c->setCallback(nextClient.get());
}
else
{
@ -633,7 +636,8 @@ void CServerHandler::startGameplay(VCMI_LIB_WRAP_NAMESPACE(CGameState) * gameSta
{
if(CMM)
CMM->disable();
client = new CClient();
std::swap(client, nextClient);
highScoreCalc = nullptr;
@ -667,7 +671,7 @@ void CServerHandler::endGameplay(bool closeConnection, bool restart)
}
client->endGame();
vstd::clear_pointer(client);
client.reset();
if(!restart)
{
@ -683,7 +687,11 @@ void CServerHandler::endGameplay(bool closeConnection, bool restart)
}
if(c)
{
nextClient = std::make_unique<CClient>();
c->setCallback(nextClient.get());
c->enterLobbyConnectionMode();
}
}
void CServerHandler::startCampaignScenario(HighScoreParameter param, std::shared_ptr<CampaignState> cs)