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

Removed throw from client disconnect

Browse Source
This commit is contained in:
mathusummut
2018-09-19 20:34:03 +02:00
parent 820b1bf5fd
commit d992eaa4bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1010,13 +1010,13 @@ namespace Glest {
//make sure we read the message //make sure we read the message
//time_t receiveTimeElapsed = time(NULL); //time_t receiveTimeElapsed = time(NULL);
NetworkMessageCommandList networkMessageCommandList; /*NetworkMessageCommandList networkMessageCommandList;
bool gotCmd = receiveMessage(&networkMessageCommandList); bool gotCmd = receiveMessage(&networkMessageCommandList);
if (gotCmd == false) { if (gotCmd == false) {
throw megaglest_runtime_error("error retrieving nmtCommandList returned false!"); throw megaglest_runtime_error("error retrieving nmtCommandList returned false!");
} }
if (SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance, "In [%s::%s Line: %d] took msecs: %lld\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, chrono.getMillis()); if (SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance, "In [%s::%s Line: %d] took msecs: %lld\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__, chrono.getMillis());
if (SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start(); if (SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start();*/
this->setLastPingInfoToNow(); this->setLastPingInfoToNow();
} }
@@ -1129,7 +1129,7 @@ namespace Glest {
return; return;
} }
throw megaglest_runtime_error("error retrieving nmtCommandList returned false!"); //throw megaglest_runtime_error("error retrieving nmtCommandList returned false!");
} }
//printf("Client Thread getFrameCount(): %d getCommandCount(): %d\n",networkMessageCommandList.getFrameCount(),networkMessageCommandList.getCommandCount()); //printf("Client Thread getFrameCount(): %d getCommandCount(): %d\n",networkMessageCommandList.getFrameCount(),networkMessageCommandList.getCommandCount());
@@ -1606,11 +1606,11 @@ namespace Glest {
} }
} else if (networkMessageType == nmtCommandList) { } else if (networkMessageType == nmtCommandList) {
//make sure we read the message //make sure we read the message
NetworkMessageCommandList networkMessageCommandList; /*NetworkMessageCommandList networkMessageCommandList;
bool gotCmd = receiveMessage(&networkMessageCommandList); bool gotCmd = receiveMessage(&networkMessageCommandList);
if (gotCmd == false) { if (gotCmd == false) {
throw megaglest_runtime_error("error retrieving nmtCommandList returned false!"); throw megaglest_runtime_error("error retrieving nmtCommandList returned false!");
} }*/
} else if (networkMessageType == nmtInvalid) { } else if (networkMessageType == nmtInvalid) {
if (chrono.getMillis() > readyWaitTimeout) { if (chrono.getMillis() > readyWaitTimeout) {
if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s] Line: %d\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__); if (SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork, "In [%s::%s] Line: %d\n", extractFileFromDirectoryPath(__FILE__).c_str(), __FUNCTION__, __LINE__);