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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-09 09:27:33 -0400 (Tue, 09 Jun 2009)
New Revision: 6947

Modified:
   trunk/data/qcsrc/client/damage.qc
   trunk/data/qcsrc/client/movetypes.qc
Log:
did findradius change in the engine? fixing pushable gibs


Modified: trunk/data/qcsrc/client/damage.qc
===================================================================
--- trunk/data/qcsrc/client/damage.qc	2009-06-09 13:11:09 UTC (rev 6946)
+++ trunk/data/qcsrc/client/damage.qc	2009-06-09 13:27:33 UTC (rev 6947)
@@ -48,11 +48,15 @@
 			thisforce = forcemul * force;
 		}
 
+		//print("check ", ftos(num_for_edict(self)), " ", self.classname, "\n");
+		//print(ftos(self.damageforcescale), "\n");
+		//print(vtos(thisforce), "\n");
 		if(self.damageforcescale)
 			if(vlen(thisforce))
 			{
 				self.move_velocity = self.move_velocity + self.damageforcescale * thisforce;
 				self.move_flags &~= FL_ONGROUND;
+				//print("pushed ", ftos(num_for_edict(self)), " loose\n");
 			}
 
 		if(self.event_damage)

Modified: trunk/data/qcsrc/client/movetypes.qc
===================================================================
--- trunk/data/qcsrc/client/movetypes.qc	2009-06-09 13:11:09 UTC (rev 6946)
+++ trunk/data/qcsrc/client/movetypes.qc	2009-06-09 13:27:33 UTC (rev 6947)
@@ -407,15 +407,15 @@
 		{
 			_Movetype_PushEntityTrace(dt * self.velocity);
 			if(!trace_startsolid)
-				self.origin = trace_endpos;
+				setorigin(self, trace_endpos);
 		}
 		else
-			self.origin = self.move_origin + dt * self.velocity;
+			setorigin(self, self.move_origin + dt * self.velocity);
 	}
 	else
 	{
 		self.velocity = self.move_velocity;
 		self.angles = self.move_angles;
-		self.origin = self.move_origin;
+		setorigin(self, self.move_origin);
 	}
 }