|
@@ -826,17 +826,12 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
|
|
|
if (new_cs->status > STATUS_AUTH) {
|
|
|
SEND_COMMAND(PACKET_SERVER_CLIENT_INFO)(new_cs, cs->GetInfo());
|
|
|
SEND_COMMAND(PACKET_SERVER_JOIN)(new_cs, cs->client_id);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
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);
|
|
|
|
|
|
/* quickly update the syncing client with company details */
|
|
|
SEND_COMMAND(PACKET_SERVER_COMPANY_UPDATE)(cs);
|
|
|
} else {
|
|
@@ -1019,16 +1014,12 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT
|
|
|
/* The client is not yet catched up? */
|
|
|
if (frame + DAY_TICKS < _frame_counter) return NETWORK_RECV_STATUS_OKAY;
|
|
|
|
|
|
/* 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");
|
|
|
}
|
|
|
|
|
|
/* The client received the frame, make note of it */
|
|
|
cs->last_frame = frame;
|