r4960 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Nov 1 08:11:26 EDT 2008


Author: div0
Date: 2008-11-01 08:11:26 -0400 (Sat, 01 Nov 2008)
New Revision: 4960

Modified:
   trunk/data/qcsrc/server/cl_player.qc
Log:
fix independent players check when damaged


Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2008-11-01 12:07:50 UTC (rev 4959)
+++ trunk/data/qcsrc/server/cl_player.qc	2008-11-01 12:11:26 UTC (rev 4960)
@@ -273,7 +273,7 @@
 	else if (take > 10)
 		sound (self, CHAN_PROJECTILE, "misc/bodyimpact1.wav", VOL_BASE, ATTN_NORM);
 
-	if not(IS_INDEPENDENT_PLAYER(self))
+	if(independent_players)
 	if(sv_gentle < 1) {	
 		if (take > 50)
 			TossGib (world, "models/gibs/chunk.mdl", hitloc, force * -0.1,1);
@@ -308,16 +308,16 @@
 
 
 		// make a meaty mess
-		if(IS_INDEPENDENT_PLAYER(self))
+		if(independent_players)
 		{
 			TossGib (self, "models/gibs/eye.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
-			MAKE_INDEPENDENT_PLAYER(self); // undo SOLID_CORPSE
+			self.solid = SOLID_TRIGGER; // undo SOLID_CORPSE
 			self.takedamage = DAMAGE_NO; // can't damage this gib, to prevent better jumps from it
 		}
 		else
 			TossGib (self, "models/gibs/eye.md3", self.origin + self.view_ofs, self.velocity + randomvec() * 150,0);
 		
-		if not(IS_INDEPENDENT_PLAYER(self))
+		if not(independent_players)
 		if(sv_gentle < 1) {
 			te_bloodshower (self.origin + self.mins, self.origin + self.maxs, 1200 * multiplier, 1000);
 			TossGib (world, "models/gibs/bloodyskull.md3", self.origin + self.view_ofs, self.velocity,0);




More information about the nexuiz-commits mailing list