diff options
| author | Darkvater <darkvater@openttd.org> | 2006-03-21 21:07:50 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-03-21 21:07:50 +0000 |
| commit | 44b991751821dfd338541569d9e704957029a008 (patch) | |
| tree | 9113d6d8762abae2cfc4f3d2b6827966fc7b1666 | |
| parent | 820b8ca230b5b0a32e75b8b3f636921f3293363f (diff) | |
| download | openttd-44b991751821dfd338541569d9e704957029a008.tar.xz | |
(svn r3997) - Default the patch-setting 'pause_on_join' to true.
| -rw-r--r-- | network_server.c | 2 | ||||
| -rw-r--r-- | settings.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/network_server.c b/network_server.c index bd3a620ad..fcf460e47 100644 --- a/network_server.c +++ b/network_server.c @@ -953,7 +953,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ACK) if (_network_pause_on_join) { DoCommandP(0, 0, 0, NULL, CMD_PAUSE); - NetworkServer_HandleChat(NETWORK_ACTION_CHAT, DESTTYPE_BROADCAST, 0, "Game unpaused", NETWORK_SERVER_INDEX); + NetworkServer_HandleChat(NETWORK_ACTION_CHAT, DESTTYPE_BROADCAST, 0, "Game unpaused (client connected)", NETWORK_SERVER_INDEX); } } diff --git a/settings.c b/settings.c index b4f0987e7..ed11c4988 100644 --- a/settings.c +++ b/settings.c @@ -1096,7 +1096,7 @@ static const SettingDescGlobVarList _network_settings[] = { SDTG_VAR("sync_freq", SLE_UINT16,C|S,0, _network_sync_freq, 100, 0, 100,STR_NULL, NULL), SDTG_VAR("frame_freq", SLE_UINT8,C|S,0, _network_frame_freq, 0, 0, 100,STR_NULL, NULL), SDTG_VAR("max_join_time", SLE_UINT16, S, 0, _network_max_join_time, 500, 0,32000,STR_NULL, NULL), - SDTG_BOOL("pause_on_join", S, 0, _network_pause_on_join, false, STR_NULL, NULL), + SDTG_BOOL("pause_on_join", S, 0, _network_pause_on_join, true, STR_NULL, NULL), SDTG_STR("server_bind_ip", SLE_STRB, S, 0, _network_server_bind_ip_host, "0.0.0.0", STR_NULL, NULL), SDTG_VAR("server_port", SLE_UINT16, S, 0, _network_server_port, NETWORK_DEFAULT_PORT, 0, 65535,STR_NULL, NULL), SDTG_BOOL("server_advertise", S, 0, _network_advertise, false, STR_NULL, NULL), |