Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / sv_main.qc

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 70b874ccaeebae87f9ef6361d79711d0ff3e9745..282916b26a3a635ae35dbf37a1a34358a492f67c 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -221,7 +221,7 @@ void StartFrame (void)
        game_delay_last = game_delay;
 
        // if in warmup stage and limit for warmup is hit start match
-       if (inWarmupStage)
+       if (warmup_stage)
        if ((g_warmup_limit > 0 && time >= g_warmup_limit)
         || (g_warmup_limit == 0 && autocvar_timelimit != 0 && time >= autocvar_timelimit * 60))
        {