Fix warmup limit

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 99411e0bb24792025366256a0444afef8175c80a..24c81a27666d7bad59504c9070ca74f9c6a40ce8 100644 (file)
--- 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(!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)
        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 04221e439ef8f85fef2017e998cc26481e6b0c62..634d3fb647185594e04001b18c1b1790ecf17942 100644 (file)
--- 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");
 
        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");
 
        g_warmup_allguns = cvar("g_warmup_allguns");
        g_warmup_allow_timeout = cvar("g_warmup_allow_timeout");