From: terencehill <piuntn@gmail.com>
Date: Tue, 20 Nov 2012 13:53:11 +0000 (+0100)
Subject: Reset alive stats right when a new round starts
X-Git-Tag: xonotic-v0.7.0~61^2~117
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc1d585541f6942f686c2b01dbf8a0f2f737cce9;p=xonotic%2Fxonotic-data.pk3dir.git

Reset alive stats right when a new round starts
---

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index fb9a422a9..ce1af0f13 100644
--- 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 645f5e17a..a28814119 100644
--- 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;
 	}