Fix for bug #1135: players receive no damage after a restart command called by a...

Respecting initial game delay (cvar g_start_delay) in CA too seems to fix it

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index ef81fd92bad7db138edb2fa1e1067d252bae875b..71457c0e51d9fb2be0126e135f2ce2932be9b77d 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -33,7 +33,7 @@ void reset_map(float dorespawn)
        if(g_arena && autocvar_g_arena_warmup)
                warmup = time + autocvar_g_arena_warmup;
        else if(g_ca) {
-               warmup = time + autocvar_g_ca_warmup;
+               warmup = max(time, game_starttime) + autocvar_g_ca_warmup;
                allowed_to_spawn = 1;
        }
        else if(g_freezetag)