dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-11-08 00:44:18 +00:00
parent 10c46946ae c38af72978
commit 3d4261a33a
16 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/network_client.cpp
View File

@@ -1202,9 +1202,9 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_NEWGAME(Packet
* care about the server shutting down. */
if (this->status >= STATUS_JOIN) {
/* To throttle the reconnects a bit, every clients waits its
* Client ID modulo 16. This way reconnects should be spread
* out a bit. */
_network_reconnect = _network_own_client_id % 16;
* Client ID modulo 16 + 1 (value 0 means no reconnect).
* This way reconnects should be spread out a bit. */
_network_reconnect = _network_own_client_id % 16 + 1;
ShowErrorMessage(STR_NETWORK_MESSAGE_SERVER_REBOOT, INVALID_STRING_ID, WL_CRITICAL);
}