r5808 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-09 08:06:22 -0500 (Mon, 09 Feb 2009)
New Revision: 5808

Modified:
   trunk/data/qcsrc/client/movetypes.qc
   trunk/data/qcsrc/client/movetypes.qh
Log:
make movetypes code a bit more flexible (allow an entity to specify its MOVE_ type)


Modified: trunk/data/qcsrc/client/movetypes.qc
===================================================================
--- trunk/data/qcsrc/client/movetypes.qc	2009-02-09 09:24:58 UTC (rev 5807)
+++ trunk/data/qcsrc/client/movetypes.qc	2009-02-09 13:06:22 UTC (rev 5808)
@@ -182,7 +182,9 @@
 
 	end = self.move_origin + push;
 
-	if(self.move_movetype == MOVETYPE_FLYMISSILE)
+	if(self.move_nomonsters)
+		type = max(0, self.move_nomonsters);
+	else if(self.move_movetype == MOVETYPE_FLYMISSILE)
 		type = MOVE_MISSILE;
 	else if(self.solid == SOLID_TRIGGER || self.solid == SOLID_NOT)
 		type = MOVE_NOMONSTERS;

Modified: trunk/data/qcsrc/client/movetypes.qh
===================================================================
--- trunk/data/qcsrc/client/movetypes.qh	2009-02-09 09:24:58 UTC (rev 5807)
+++ trunk/data/qcsrc/client/movetypes.qh	2009-02-09 13:06:22 UTC (rev 5808)
@@ -8,6 +8,7 @@
 .void(void) move_touch;
 .float move_bounce_factor;
 .float move_bounce_stopspeed;
+.float move_nomonsters; // -1 for MOVE_NORMAL, otherwise a MOVE_ constant
 
 void Movetype_Physics(float matchserver);