Reset alive stats right when a new round starts

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index fb9a422a9f889013ee9246cf04313980c858380f..ce1af0f1350748963d0938961bfb095464696460 100644 (file)
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -44,6 +44,7 @@ void reset_map(float dorespawn)
        }
        else if(g_freezetag)
        {
+               redalive = bluealive = yellowalive = pinkalive = 0;
                warmup = max(time, game_starttime);
                if(autocvar_g_freezetag_warmup > 0)
                        warmup += autocvar_g_freezetag_warmup;

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 645f5e17a0b5cba535df15734a1dcd68545a0403..a288141197edb0d56c46165722795a486195b74b 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -51,7 +51,6 @@ void freezetag_CheckWinner()
                TeamScore_AddToTeam(winner.team, ST_SCORE, +1);
        }
 
-       redalive = bluealive = yellowalive = pinkalive = 0;
        next_round = time + 5;
 }
 
@@ -322,7 +321,6 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn)
        if(total_players == 1) // only one player active on server, start a new match immediately
        if(!next_round && warmup && (time < warmup - autocvar_g_freezetag_warmup || time > warmup)) // not awaiting next round
        {
-               redalive = bluealive = yellowalive = pinkalive = 0;
                next_round = time;
                return 1;
        }