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 remote-tracking branch 'vcmi/beta' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-12 17:28:47 +03:00
parent ad8695ac91 92ce97bbc7
commit f13a53c1d9
95 changed files with 1628 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CVCMIServer.cpp
View File

@@ -258,6 +258,12 @@ void CVCMIServer::prepareToRestart()
* si = * gh->gs->initialOpts;
si->seedToBeUsed = si->seedPostInit = 0;
state = EServerState::LOBBY;
if (si->campState)
{
assert(si->campState->currentScenario().has_value());
campaignMap = si->campState->currentScenario().value_or(CampaignScenarioID(0));
campaignBonus = si->campState->getBonusID(campaignMap).value_or(-1);
}
// FIXME: dirry hack to make sure old CGameHandler::run is finished
boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
}