games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

Server: add GAMEPLAY_STARTING state (#450)

Browse Source 
Fixes issue 2962.
This commit is contained in:
Karlis Senko 2018-04-22 17:40:02 +03:00 committed by Arseniy Shestakov
parent d9d01f0b68
commit 965b33d16a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/CVCMIServer.cpp
View File

@ -176,7 +176,7 @@ void CVCMIServer::run()
} }
} }
while(state == EServerState::LOBBY) while(state == EServerState::LOBBY || state == EServerState::GAMEPLAY_STARTING)
boost::this_thread::sleep(boost::posix_time::milliseconds(50)); boost::this_thread::sleep(boost::posix_time::milliseconds(50));
logNetwork->info("Thread handling connections ended"); logNetwork->info("Thread handling connections ended");

1
server/CVCMIServer.h
View File

@ -32,6 +32,7 @@ class CBaseForGHApply;
enum class EServerState : ui8 enum class EServerState : ui8
{ {
LOBBY, LOBBY,
GAMEPLAY_STARTING,
GAMEPLAY, GAMEPLAY,
GAMEPLAY_ENDED, GAMEPLAY_ENDED,
SHUTDOWN SHUTDOWN

4
server/NetPacksLobbyServer.cpp
View File

@ -115,6 +115,9 @@ bool LobbyChatMessage::checkClientPermissions(CVCMIServer * srv) const
bool LobbySetMap::applyOnServer(CVCMIServer * srv) bool LobbySetMap::applyOnServer(CVCMIServer * srv)
{ {
if(srv->state != EServerState::LOBBY)
return false;
srv->updateStartInfoOnMapChange(mapInfo, mapGenOpts); srv->updateStartInfoOnMapChange(mapInfo, mapGenOpts);
return true; return true;
} }
@ -172,6 +175,7 @@ bool LobbyStartGame::applyOnServer(CVCMIServer * srv)
return false; return false;
} }
// Server will prepare gamestate and we announce StartInfo to clients // Server will prepare gamestate and we announce StartInfo to clients
srv->state = EServerState::GAMEPLAY_STARTING;
srv->prepareToStartGame(); srv->prepareToStartGame();
initializedStartInfo = std::make_shared<StartInfo>(*srv->gh->getStartInfo(true)); initializedStartInfo = std::make_shared<StartInfo>(*srv->gh->getStartInfo(true));
return true; return true;