Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- should fix the strange pause / unpause behaviour for joining in progress games

Browse Source
This commit is contained in:
Mark Vejvoda 2013-03-14 21:41:15 +00:00
parent e7907394de
commit cb96232256
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/glest_game/network/connection_slot.cpp
View File

@ -322,12 +322,14 @@ ConnectionSlot::ConnectionSlot(ServerInterface* serverInterface, int playerIndex
this->gotLagCountWarning = false; this->gotLagCountWarning = false;
this->lastReceiveCommandListTime = 0; this->lastReceiveCommandListTime = 0;
this->receivedNetworkGameStatus = false; this->receivedNetworkGameStatus = false;
this->canAcceptConnections = true;
this->startInGameConnectionLaunch = false;
this->sentSavedGameInfo = false;
this->unPauseForInGameConnection = false;
this->skipLagCheck = false; this->skipLagCheck = false;
this->joinGameInProgress = false; this->joinGameInProgress = false;
this->canAcceptConnections = true;
this->startInGameConnectionLaunch = false;
this->pauseForInGameConnection = false;
this->unPauseForInGameConnection = false;
this->sentSavedGameInfo = false;
this->setSocket(NULL); this->setSocket(NULL);
this->slotThreadWorker = NULL; this->slotThreadWorker = NULL;
@ -1460,6 +1462,7 @@ void ConnectionSlot::close() {
this->skipLagCheck = false; this->skipLagCheck = false;
this->joinGameInProgress = false; this->joinGameInProgress = false;
this->sentSavedGameInfo = false; this->sentSavedGameInfo = false;
this->pauseForInGameConnection = false;
this->unPauseForInGameConnection = false; this->unPauseForInGameConnection = false;
this->ready= false; this->ready= false;
this->connectedTime = 0; this->connectedTime = 0;

4
source/glest_game/network/connection_slot.h
View File

@ -128,8 +128,6 @@ private:
bool receivedNetworkGameStatus; bool receivedNetworkGameStatus;
time_t connectedTime; time_t connectedTime;
bool gotIntro; bool gotIntro;
bool skipLagCheck;
bool joinGameInProgress;
Mutex *mutexCloseConnection; Mutex *mutexCloseConnection;
@ -146,6 +144,8 @@ private:
int playerStatus; int playerStatus;
string playerLanguage; string playerLanguage;
bool skipLagCheck;
bool joinGameInProgress;
bool canAcceptConnections; bool canAcceptConnections;
bool startInGameConnectionLaunch; bool startInGameConnectionLaunch;
bool pauseForInGameConnection; bool pauseForInGameConnection;