From: Mario <mario.mario@y7mail.com>
Date: Sun, 2 Jun 2013 22:16:16 +0000 (+1000)
Subject: Make frozen state spectate-able
X-Git-Tag: xonotic-v0.8.0~241^2^2~204
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a1156d6990e636739ac9e26285b469ed3c922dd;p=xonotic%2Fxonotic-data.pk3dir.git

Make frozen state spectate-able
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 72011d479..a1206c583 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1735,6 +1735,8 @@ void SpectateCopy(entity spectatee) {
 	self.dmg_inflictor = spectatee.dmg_inflictor;
 	self.v_angle = spectatee.v_angle;
 	self.angles = spectatee.v_angle;
+	self.frozen = spectatee.frozen;
+	self.revive_progress = spectatee.revive_progress;
 	if(!self.BUTTON_USE)
 		self.fixangle = TRUE;
 	setorigin(self, spectatee.origin);
diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index d5daee217..325b6c29c 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -500,13 +500,6 @@ MUTATOR_HOOKFUNCTION(freezetag_BotRoles)
 	return TRUE;
 }
 
-MUTATOR_HOOKFUNCTION(freezetag_SpectateCopy)
-{
-	self.frozen = other.frozen;
-	self.revive_progress = other.revive_progress;
-	return 0;
-}
-
 MUTATOR_HOOKFUNCTION(freezetag_GetTeamCount)
 {
 	freezetag_teams = autocvar_g_freezetag_teams_override;
@@ -542,7 +535,6 @@ MUTATOR_DEFINITION(gamemode_freezetag)
 	MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST);
 	MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY);
 	MUTATOR_HOOK(HavocBot_ChooseRule, freezetag_BotRoles, CBC_ORDER_ANY);
-	MUTATOR_HOOK(SpectateCopy, freezetag_SpectateCopy, CBC_ORDER_ANY);
 	MUTATOR_HOOK(GetTeamCount, freezetag_GetTeamCount, CBC_ORDER_EXCLUSIVE);
 
 	MUTATOR_ONADD