Fix warmup limit 301/head
authorterencehill <piuntn@gmail.com>
Mon, 28 Mar 2016 18:39:56 +0000 (20:39 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 28 Mar 2016 18:39:56 +0000 (20:39 +0200)
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qh

index 99411e0..24c81a2 100644 (file)
@@ -733,6 +733,9 @@ spawnfunc(worldspawn)
        if(!limits_are_set)
                SetLimits(autocvar_fraglimit_override, autocvar_leadlimit_override, autocvar_timelimit_override, -1);
 
+       if(warmup_limit == 0)
+               warmup_limit = (autocvar_timelimit > 0) ? autocvar_timelimit * 60 : autocvar_timelimit;
+
        player_count = 0;
        bot_waypoints_for_items = autocvar_g_waypoints_for_items;
        if(bot_waypoints_for_items == 1)
index 04221e4..634d3fb 100644 (file)
@@ -262,8 +262,6 @@ void readlevelcvars()
 
        warmup_stage = cvar("g_warmup");
        warmup_limit = cvar("g_warmup_limit");
-       if(warmup_limit == 0)
-               warmup_limit = (autocvar_timelimit > 0) ? autocvar_timelimit * 60 : autocvar_timelimit;
        g_warmup_allguns = cvar("g_warmup_allguns");
        g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");