mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21400) -Fix [FS#4284]: when loading a savegame takes more than 2 seconds locally, don't see that as lag of the server. Also increase the client side's lag thresholds a bit

release/1.1
rubidium 2010-12-05 14:49:46 +00:00
parent 216e48cd07
commit ff8a01fbd2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/network_client.cpp
View File

@ -833,6 +833,9 @@ DEF_GAME_RECEIVE_COMMAND(Client, PACKET_SERVER_MAP_DONE)
/* The map is done downloading, load it */ /* The map is done downloading, load it */
bool load_success = SafeLoad(NULL, SL_LOAD, GM_NORMAL, NO_DIRECTORY, lf); bool load_success = SafeLoad(NULL, SL_LOAD, GM_NORMAL, NO_DIRECTORY, lf);
/* Long savegame loads shouldn't affect the lag calculation! */
this->last_packet = _realtime_tick;
if (!load_success) { if (!load_success) {
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
_switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR; _switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR;
@ -1133,14 +1136,14 @@ void ClientNetworkGameSocketHandler::CheckConnection()
/* It might... sometimes occur that the realtime ticker overflows. */ /* It might... sometimes occur that the realtime ticker overflows. */
if (_realtime_tick < this->last_packet) this->last_packet = _realtime_tick; if (_realtime_tick < this->last_packet) this->last_packet = _realtime_tick;
/* Lag is in milliseconds; 2 seconds are roughly the server's /* Lag is in milliseconds; 5 seconds are roughly twice the
* "you're slow" threshold (1 game day). */ * server's "you're slow" threshold (1 game day). */
uint lag = (_realtime_tick - this->last_packet) / 1000; uint lag = (_realtime_tick - this->last_packet) / 1000;
if (lag < 2) return; if (lag < 5) return;
/* 10 seconds are (way) more than 4 game days after which /* 20 seconds are (way) more than 4 game days after which
* the server will forcefully disconnect you. */ * the server will forcefully disconnect you. */
if (lag > 10) { if (lag > 20) {
this->NetworkGameSocketHandler::CloseConnection(); this->NetworkGameSocketHandler::CloseConnection();
_switch_mode_errorstr = STR_NETWORK_ERROR_LOSTCONNECTION; _switch_mode_errorstr = STR_NETWORK_ERROR_LOSTCONNECTION;
return; return;