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

(svn r18054) -Change/Fix [FS#3310]: make pause on join pause during the whole joining (including download) phase

Browse Source
This commit is contained in:
rubidium
2009-11-12 20:52:14 +00:00
parent 64ecceadda
commit b0f18a27fb
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/network_server.cpp
View File

@@ -829,11 +829,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_MAP_OK)
}
}
if (_settings_client.network.pause_on_join) {
/* Now pause the game till the client is in sync */
DoCommandP(0, PM_PAUSED_JOIN, 1, CMD_PAUSE);
}
/* also update the new client with our max values */
SEND_COMMAND(PACKET_SERVER_CONFIG_UPDATE)(cs);
@@ -1022,10 +1017,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ACK)
/* Now he is! Unpause the game */
cs->status = STATUS_ACTIVE;
if (_pause_mode & PM_PAUSED_JOIN) {
DoCommandP(0, PM_PAUSED_JOIN, 0, CMD_PAUSE);
}
/* Execute script for, e.g. MOTD */
IConsoleCmdExec("exec scripts/on_server_connect.scr 0");
}