From 3074dccba4c43c90d73f61d1cf05b28915a5a802 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 17 Nov 2012 22:59:41 +0100 Subject: [PATCH] Add a few sanity checks --- qcsrc/server/arena.qc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index 3300673f3..ff4a57b6c 100644 --- 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 = max(time, game_starttime) + autocvar_g_arena_warmup; - else if(g_ca) { - warmup = max(time, game_starttime) + 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 = max(time, game_starttime) + autocvar_g_freezetag_warmup; + warmup = max(time, game_starttime); + if(autocvar_g_freezetag_warmup > 0) + warmup += autocvar_g_freezetag_warmup; } lms_lowest_lives = 999; -- 2.39.2