From: terencehill Date: Mon, 28 Mar 2016 18:39:56 +0000 (+0200) Subject: Fix warmup limit X-Git-Tag: xonotic-v0.8.2~980^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F301%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Fix warmup limit --- diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 99411e0bb..24c81a276 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -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) diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 04221e439..634d3fb64 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -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");