only add a new ice block if there isn't an old one, this way other code doesn't worry...

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 829290163e080277e3a20cb5ef29fbb69a3bd32f..4802d6db22a3a66f9f9e9210935686e52f17f915 100644 (file)
--- 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 4da6f20360ed94f984284e9d240c7143e2c3d880..8df04eace63e4d878d8f8b2da6672021debdf2c9 100644 (file)
--- 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)