r5095 - trunk/data

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2008-11-25 09:13:37 -0500 (Tue, 25 Nov 2008)
New Revision: 5095

Modified:
   trunk/data/defaultNexuiz.cfg
Log:
for now rather use g_start_delay 15 instead of g_warmup 1 for dedicated servers, people seem to like it more


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-11-25 09:11:00 UTC (rev 5094)
+++ trunk/data/defaultNexuiz.cfg	2008-11-25 14:13:37 UTC (rev 5095)
@@ -138,8 +138,7 @@
 set g_maxplayers_spectator_blocktime 5 //if the players voted for the "nospectators" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked
 
 //tournament mod
-set g_warmup 0 //split the game into a warmup- and match-stage
-	if_dedicated set g_warmup 1
+set g_warmup 0 //split the game into a warmup- and match-stage when set to 1
 set g_warmup_limit 60 //if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time (useful for public matches)
 set g_warmup_allow_timeout 0 //if set to 0 you cannot use the calltimeout command during the warmup-stage but only during the match stage
 set g_warmup_allguns 0 //if set players start with all guns in warmup mode
@@ -1176,6 +1175,7 @@
 set g_maplist_allow_hidden 1 // allow hidden maps to be, e.g., voted for and in the maplist
 
 set g_start_delay 0 // delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server
+	if_dedicated set g_start_delay 15
 
 alias ons_map           "cl_cmd radar" // legacy alias
 alias radar             "cl_cmd radar"