Add a few sanity checks

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

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index ef81fd92bad7db138edb2fa1e1067d252bae875b..ff4a57b6cfd28074bf408dcbba443e1857f954db 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -30,15 +30,24 @@ void reset_map(float dorespawn)
        entity oldself;
        oldself = self;
 
-       if(g_arena && autocvar_g_arena_warmup)
-               warmup = time + autocvar_g_arena_warmup;
-       else if(g_ca) {
-               warmup = time + autocvar_g_ca_warmup;
+       if(g_arena)
+       {
+               warmup = max(time, game_starttime);
+               if(autocvar_g_arena_warmup > 0)
+                       warmup += autocvar_g_arena_warmup;
+       }
+       else if(g_ca)
+       {
+               warmup = max(time, game_starttime);
+               if(autocvar_g_ca_warmup > 0)
+                       warmup += autocvar_g_ca_warmup;
                allowed_to_spawn = 1;
        }
        else if(g_freezetag)
        {
-               warmup = time + autocvar_g_freezetag_warmup;
+               warmup = max(time, game_starttime);
+               if(autocvar_g_freezetag_warmup > 0)
+                       warmup += autocvar_g_freezetag_warmup;
        }
 
        lms_lowest_lives = 999;