r3384 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-02-16 08:35:33 -0500 (Sat, 16 Feb 2008)
New Revision: 3384

Modified:
   trunk/data/qcsrc/server/cl_player.qc
Log:
defer_ClientKill_Now_TeamChange


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-02-16 13:06:38 UTC (rev 3383)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-02-16 13:35:33 UTC (rev 3384)
@@ -427,6 +427,9 @@
 
 	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 @@
 			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 @@
 
 		if(g_arena)
 			Spawnqueue_Unmark(self);
+
+		if(defer_ClientKill_Now_TeamChange)
+			ClientKill_Now_TeamChange();
 	}
 }