(svn r4015) -Backport from trunk: Default the patch-setting 'pause_on_join' to true. 0.4.5
authorcelestar
Wed, 22 Mar 2006 11:17:21 +0000
branch0.4.5
changeset 9945 10025bb0aff2
parent 9944 4f027626dbf6
child 9946 d3cb7e05c5a6
(svn r4015) -Backport from trunk: Default the patch-setting 'pause_on_join' to true.
network_server.c
settings.c
--- a/network_server.c	Wed Mar 22 11:13:20 2006 +0000
+++ b/network_server.c	Wed Mar 22 11:17:21 2006 +0000
@@ -961,7 +961,7 @@
 
 		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);
 		}
 	}
 
--- a/settings.c	Wed Mar 22 11:13:20 2006 +0000
+++ b/settings.c	Wed Mar 22 11:17:21 2006 +0000
@@ -777,7 +777,7 @@
 	{"sync_freq",				SDT_UINT16 | SDT_NOSAVE,	(void*)100,			&_network_sync_freq,		NULL},
 	{"frame_freq",			SDT_UINT8 | SDT_NOSAVE,	(void*)0,			&_network_frame_freq,		NULL},
 	{"max_join_time",		SDT_UINT16,	(void*)500,	&_network_max_join_time,	NULL},
-	{"pause_on_join",		SDT_BOOL, (void*)false, &_network_pause_on_join, NULL},
+	{"pause_on_join",		SDT_BOOL, (void*)true, &_network_pause_on_join, NULL},
 	{"server_bind_ip",	SDT_STRINGBUF | (lengthof(_network_server_bind_ip_host) << 16),	"0.0.0.0",	&_network_server_bind_ip_host,	NULL},
 	{"server_port",			SDT_UINT,	(void*)NETWORK_DEFAULT_PORT,	&_network_server_port,	NULL},
 	{"server_advertise",SDT_BOOL, (void*)false, &_network_advertise, NULL},