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/master' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-11 15:59:55 +00:00
parent 719f920914 286a70c007
commit 6b8f94e6e7
96 changed files with 4648 additions and 4084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CServerHandler.cpp
View File

@ -648,14 +648,14 @@ void CServerHandler::startGameplay(VCMI_LIB_WRAP_NAMESPACE(CGameState) * gameSta
if(CMM)
CMM->disable();
campaignScoreCalculator = nullptr;
switch(si->mode)
{
case EStartMode::NEW_GAME:
client->newGame(gameState);
break;
case EStartMode::CAMPAIGN:
if(si->campState->conqueredScenarios().empty())
campaignScoreCalculator.reset();
client->newGame(gameState);
break;
case EStartMode::LOAD_GAME: