[nexuiz-commits] r6255 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-23 14:34:38 -0400 (Mon, 23 Mar 2009)
New Revision: 6255

Modified:
   trunk/data/qcsrc/client/gibs.qc
   trunk/data/qcsrc/client/movetypes.qc
Log:
gibs: handle wasfreed


Modified: trunk/data/qcsrc/client/gibs.qc
===================================================================
--- trunk/data/qcsrc/client/gibs.qc	2009-03-23 18:11:42 UTC (rev 6254)
+++ trunk/data/qcsrc/client/gibs.qc	2009-03-23 18:34:38 UTC (rev 6255)
@@ -26,6 +26,8 @@
 	oldorg = self.origin;
 
 	Movetype_Physics(FALSE);
+	if(wasfreed(self))
+		return;
 	
 	if(self.touch == Gib_Touch) // don't do this for the "chunk" thingie...
 		trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin);

Modified: trunk/data/qcsrc/client/movetypes.qc
===================================================================
--- trunk/data/qcsrc/client/movetypes.qc	2009-03-23 18:11:42 UTC (rev 6254)
+++ trunk/data/qcsrc/client/movetypes.qc	2009-03-23 18:34:38 UTC (rev 6255)
@@ -373,6 +373,9 @@
 		}
 	}
 
+	if(wasfreed(self))
+		return;
+
 	self.avelocity = self.move_avelocity;
 
 	if(dt > 0 && self.move_movetype != MOVETYPE_NONE)
@@ -404,7 +407,4 @@
 		self.angles = self.move_angles;
 		self.origin = self.move_origin;
 	}
-
-	if(!wasfreed(self))
-		setorigin(self, self.origin);
 }