games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Hackfix for campaigns

Browse Source
This commit is contained in:
Dydzio 2019-03-29 23:29:48 +01:00
parent 97869fc36f
commit 2b6fe9298a
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/CMT.cpp
View File

@ -1281,6 +1281,7 @@ static void handleEvent(SDL_Event & ev)
}
else
{
boost::this_thread::sleep(boost::posix_time::milliseconds(1000)); //TODO: thread sync and execute this after server closes
finisher();
}
}

5
client/CPlayerInterface.cpp
View File

@ -2469,14 +2469,9 @@ void CPlayerInterface::requestReturningToMainMenu(bool won)
{
CCS->soundh->ambientStopAllChannels();
if(won && cb->getStartInfo()->campState)
{
CSH->state = EClientState::DISCONNECTING; // do not close server, it's not intended for campaign continuation
CSH->startCampaignScenario(cb->getStartInfo()->campState);
}
else
{
sendCustomEvent(EUserEvent::RETURN_TO_MAIN_MENU);
}
}
void CPlayerInterface::sendCustomEvent( int code )