mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-19 06:31:19 +02:00
Code Issues Projects Releases Wiki Activity

- bug fix to send packets every 4 seconds if nothing has been sent (especially when the game is paused)

Browse Source
This commit is contained in:
Mark Vejvoda
2013-03-08 04:41:57 +00:00
parent aec3ff1f63
commit 198fa1d05d
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,7 @@ void ClientInterface::update() {
quit= true; quit= true;
return; return;
} }
try { try {
NetworkMessageCommandList networkMessageCommandList(currentFrameCount); NetworkMessageCommandList networkMessageCommandList(currentFrameCount);
@@ -195,23 +196,40 @@ void ClientInterface::update() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took %lld msecs\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis()); if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took %lld msecs\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis());
if((currentFrameCount >= this->gameSettings.getNetworkFramePeriod() && //printf("#1 Client send currentFrameCount = %d lastSendElapsed = %f\n",currentFrameCount,lastSendElapsed);
currentFrameCount % this->gameSettings.getNetworkFramePeriod() == 0) ||
networkMessageCommandList.getCommandCount() > 0 ||
(lastNetworkCommandListSendTime > 0 && lastSendElapsed >= ClientInterface::maxNetworkCommandListSendTimeWait)) {
lastNetworkCommandListSendTime = time(NULL);
if(lastSentFrameCount < currentFrameCount || networkMessageCommandList.getCommandCount() > 0) { // If we are on a frame that should send packets or we have commands
//printf("#1 Client send currentFrameCount = %d lastSentFrameCount = %d\n",currentFrameCount,lastSentFrameCount ); // to send now, send it now.
if((currentFrameCount >= this->gameSettings.getNetworkFramePeriod() &&
currentFrameCount % this->gameSettings.getNetworkFramePeriod() == 0) ||
networkMessageCommandList.getCommandCount() > 0) {
//printf("#2 Client send currentFrameCount = %d lastSendElapsed = %f\n",currentFrameCount,lastSendElapsed);
if(lastSentFrameCount < currentFrameCount ||
networkMessageCommandList.getCommandCount() > 0) {
//printf("#3 Client send currentFrameCount = %d lastSentFrameCount = %d\n",currentFrameCount,lastSentFrameCount );
lastSentFrameCount = currentFrameCount; lastSentFrameCount = currentFrameCount;
sendMessage(&networkMessageCommandList); sendMessage(&networkMessageCommandList);
lastNetworkCommandListSendTime = time(NULL);
lastSendElapsed = difftime((long int)time(NULL),lastNetworkCommandListSendTime);
} }
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took %lld msecs\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis()); if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took %lld msecs\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis());
} }
else { // If we have not sent anything for maxNetworkCommandListSendTimeWait
//printf("#2 SKIP Client send currentFrameCount = %d\n",currentFrameCount ); // seconds, send one now.
if(lastNetworkCommandListSendTime > 0 &&
lastSendElapsed >= ClientInterface::maxNetworkCommandListSendTimeWait) {
//printf("#4 Client send currentFrameCount = %d lastSendElapsed = %f\n",currentFrameCount,lastSendElapsed);
lastSentFrameCount = currentFrameCount;
sendMessage(&networkMessageCommandList);
lastNetworkCommandListSendTime = time(NULL);
lastSendElapsed = difftime((long int)time(NULL),lastNetworkCommandListSendTime);
if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 1) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] took %lld msecs\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis());
} }
// Possible cause of out of synch since we have more commands that need // Possible cause of out of synch since we have more commands that need