From 649ea9e803110ee25ba173a99db9818b7ec484d7 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Thu, 25 Nov 2010 16:10:14 +0200 Subject: [PATCH] only add a new ice block if there isn't an old one, this way other code doesn't worry about this happening --- qcsrc/server/cl_player.qc | 7 +------ qcsrc/server/mutators/gamemode_freezetag.qc | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 829290163..4802d6db2 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -626,12 +626,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht MUTATOR_CALLHOOK(PlayerDies); if(g_freezetag) - { - if(deathtype != DEATH_KILL || attacker == self) - return; - else // team change or kill trigger - freezetag_Unfreeze(); // remove all ice blocks - } + return; if(self.flagcarried) { diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 4da6f2036..8df04eace 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -134,9 +134,9 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) else if(self.team == COLOR_TEAM4) --pinkalive; --totalalive; - } - freezetag_Freeze(); + freezetag_Freeze(); + } centerprint(frag_attacker, strcat("^2You froze ^7", frag_target.netname, ".\n")); if(frag_attacker == frag_target || frag_attacker == world) -- 2.39.2