From 1a3b84193b3c42c389d27f0d5e545f5509f17758 Mon Sep 17 00:00:00 2001 From: div0 Date: Sat, 16 Feb 2008 13:35:33 +0000 Subject: [PATCH] defer_ClientKill_Now_TeamChange git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3384 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_player.qc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index f717ac8b6..1ed594bd5 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -427,6 +427,9 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht if (self.health < 1) { + float defer_ClientKill_Now_TeamChange; + defer_ClientKill_Now_TeamChange = FALSE; + self.deaths += 1; // get rid of kill indicator @@ -435,7 +438,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht remove(self.killindicator); self.killindicator = world; if(self.killindicator_teamchange) - ClientKill_Now_TeamChange(); + defer_ClientKill_Now_TeamChange = TRUE; } // become fully visible @@ -530,6 +533,9 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht if(g_arena) Spawnqueue_Unmark(self); + + if(defer_ClientKill_Now_TeamChange) + ClientKill_Now_TeamChange(); } } -- 2.39.2