mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-30 09:29:25 +02:00
Code Issues Projects Releases Wiki Activity

numerous important bugfixes:

Browse Source 
- observers and end game fog of war enable would most likely cause out of synch, I think its fixed now
- better handling of threaded logging
- cleanup of socket thread processing to ensure all network packets get processed properly and in order
This commit is contained in:
Mark Vejvoda
2010-12-24 08:43:09 +00:00
parent 2a4c9a99cd
commit 03eaa2c033
12 changed files with 165 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/network/client_interface.cpp
View File

@@ -208,7 +208,7 @@ void ClientInterface::updateLobby() {
versionMatched = true;
string playerNameStr = getHumanPlayerName();
sErr = "Warning, Server and client are using the same version but different platforms.\n\nServer: " + networkMessageIntro.getVersionString() +
sErr = "Warning, Server and client are using the same version but different platforms.\n\nServer: " + networkMessageIntro.getVersionString() +
"\nClient: " + getNetworkVersionString() + " player [" + playerNameStr + "]";
printf("%s\n",sErr.c_str());
@@ -553,7 +553,7 @@ void ClientInterface::updateKeyframe(int frameCount)
isConnected() == true &&
difftime(time(NULL),receiveTimeElapsed) <= (messageWaitTimeout / 1000)) {
//sleep(waitSleepTime);
sleep(0);
//sleep(0);
waitCount++;
}
@@ -605,7 +605,7 @@ void ClientInterface::updateKeyframe(int frameCount)
while(receiveMessage(&networkMessageQuit) == false &&
isConnected() == true &&
difftime(time(NULL),receiveTimeElapsed) <= (messageWaitTimeout / 1000)) {
sleep(0);
//sleep(0);
}
quit= true;
done= true;
@@ -619,7 +619,7 @@ void ClientInterface::updateKeyframe(int frameCount)
while(receiveMessage(&networkMessageText) == false &&
isConnected() == true &&
difftime(time(NULL),receiveTimeElapsed) <= (messageWaitTimeout / 1000)) {
sleep(0);
//sleep(0);
}
ChatMsgInfo msg(networkMessageText.getText().c_str(),networkMessageText.getTeamIndex(),networkMessageText.getPlayerIndex());
@@ -866,7 +866,7 @@ void ClientInterface::waitForMessage()
}
// Sleep ever second we wait to let other threads work
else if(chrono.getMillis() % 1000 == 0) {
sleep(0);
//sleep(0);
}
//sleep(waitSleepTime);