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

- try to fix network stuterring

Browse Source
This commit is contained in:
Mark Vejvoda 2011-11-25 21:30:32 +00:00
parent cbc4b0a8d3
commit 09241222ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1038,7 +1038,7 @@ NetworkMessageType ClientInterface::waitForMessage()
NetworkMessageType msg = nmtInvalid;
//uint64 waitLoopCount = 0;
while(msg == nmtInvalid) {
msg = getNextMessageType(200);
msg = getNextMessageType(5);
if(msg == nmtInvalid) {
if(chrono.getMillis() % 250 == 0 && isConnected() == false) {
if(quit == false) {

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

@ -496,15 +496,15 @@ bool ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
//this->clearChatInfo();
bool gotTextMsg = true;
for(;this->hasDataToReadWithWait(250) == true && gotTextMsg == true;) {
//bool gotTextMsg = true;
//for(;this->hasDataToReadWithWait(100) == true && gotTextMsg == true;) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] polling for networkMessageType...\n",__FILE__,__FUNCTION__,__LINE__);
NetworkMessageType networkMessageType= getNextMessageType(200);
NetworkMessageType networkMessageType= getNextMessageType(100);
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] networkMessageType = %d\n",__FILE__,__FUNCTION__,__LINE__,networkMessageType);
gotTextMsg = false;
//gotTextMsg = false;
//process incoming commands
switch(networkMessageType) {
@ -543,7 +543,7 @@ bool ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
if(receiveMessage(&networkMessageText)) {
ChatMsgInfo msg(networkMessageText.getText().c_str(),networkMessageText.getTeamIndex(),networkMessageText.getPlayerIndex(),networkMessageText.getTargetLanguage());
this->addChatInfo(msg);
gotTextMsg = true;
//gotTextMsg = true;
}
else {
if(SystemFlags::getSystemSettingType(SystemFlags::debugError).enabled) SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d]\nInvalid message type before intro handshake [%d]\nDisconnecting socket for slot: %d [%s].\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,networkMessageType,this->playerIndex,this->getIpAddress().c_str());
@ -1007,7 +1007,7 @@ bool ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
}
}
}
}
//}
//if(chrono.getMillis() > 1) printf("In [%s::%s Line: %d] action running for msecs: %lld\n",__FILE__,__FUNCTION__,__LINE__,(long long int)chrono.getMillis());