Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 7f8931bffe648c90d3bd4a7b3eada671725f66e6..53719e075f9099273be8a139820681786c3194ff 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1264,7 +1264,7 @@ void readlevelcvars(void)
     if(!g_weapon_stay)
         g_weapon_stay = cvar("g_weapon_stay");
 
-       if not(inWarmupStage && !g_ca)
+       if not(inWarmupStage)
                game_starttime = cvar("g_start_delay");
 
        sv_pitch_min = cvar("sv_pitch_min");