From: terencehill <piuntn@gmail.com>
Date: Thu, 14 Feb 2013 17:24:16 +0000 (+0100)
Subject: Do not unfreeze automatically any player if the round is over
X-Git-Tag: xonotic-v0.7.0~61^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f6854248a5ecf60d863e8499c216699c6ceb6cb;p=xonotic%2Fxonotic-data.pk3dir.git

Do not unfreeze automatically any player if the round is over
---

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 6c3b662d4..9defc3b66 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -604,8 +604,6 @@ float serverflags;
 .float player_blocked;
 
 .float freezetag_frozen;
-.float freezetag_frozen_timeout;
-.float freezetag_revive_progress;
 
 .entity muzzle_flash;
 .float misc_bulletcounter;	// replaces uzi & hlac bullet counter.
diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index a7c23dc52..1fd30de29 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -1,3 +1,5 @@
+.float freezetag_frozen_timeout;
+.float freezetag_revive_progress;
 float freezetag_teams;
 float freezetag_CheckTeams();
 float freezetag_CheckWinner();
@@ -118,6 +120,8 @@ float freezetag_CheckWinner()
 		FOR_EACH_REALCLIENT(e)
 			centerprint(e, "Round over, there's no winner");
 		bprint("Round over, there's no winner.\n");
+		FOR_EACH_PLAYER(e)
+			e.freezetag_frozen_timeout = 0;
 		return 1;
 	}
 
@@ -142,6 +146,8 @@ float freezetag_CheckWinner()
 		bprint("^5Round tied! All teams were frozen.\n");
 	}
 
+	FOR_EACH_PLAYER(e)
+		e.freezetag_frozen_timeout = 0;
 	return 1;
 }
 
@@ -561,7 +567,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPhysics)
 
 MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate)
 {
-	if(frag_target.freezetag_frozen == 1 && frag_deathtype != DEATH_HURTTRIGGER)
+	if(frag_target.freezetag_frozen && frag_deathtype != DEATH_HURTTRIGGER)
 	{
 		frag_damage = 0;
 		frag_force = frag_force * autocvar_g_freezetag_frozen_force;