games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-20 00:22:54 +02:00
Code Issues Releases Activity

rmb; bugfix; tabs

Browse Source
This commit is contained in:
Laserlicht
2023-09-23 14:51:39 +02:00
committed by GitHub
parent d2398b804a
commit e3edcb6cd8
3 changed files with 289 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/CServerHandler.cpp
View File

@@ -600,6 +600,8 @@ void CServerHandler::startGameplay(VCMI_LIB_WRAP_NAMESPACE(CGameState) * gameSta
CMM->disable();
client = new CClient();
calc = nullptr;
switch(si->mode)
{
case StartInfo::NEW_GAME:
@@ -674,8 +676,11 @@ void CServerHandler::startCampaignScenario(HighScoreParameter param, std::shared
std::shared_ptr<CampaignState> ourCampaign = cs;
if (!cs)
{
ourCampaign = si->campState;
if(calc == nullptr)
{
calc = std::make_shared<HighScoreCalculation>();
calc->isCampaign = true;
calc->parameters.clear();
}
@@ -950,7 +955,7 @@ void CServerHandler::threadRunServer()
}
comm += " > \"" + logName + '\"';
logGlobal->info("Server command line: %s", comm);
logGlobal->info("Server command line: %s", comm);
#ifdef VCMI_WINDOWS
int result = -1;