[nexuiz-commits] r7281 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-29 15:26:13 -0400 (Wed, 29 Jul 2009)
New Revision: 7281

Modified:
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/defs.qh
Log:
do not set a movetype for spectators...


Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-07-29 12:51:47 UTC (rev 7280)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-07-29 19:26:13 UTC (rev 7281)
@@ -2047,6 +2047,7 @@
 		WriteByte(MSG_ONE, SVC_SETVIEW);
 		WriteEntity(MSG_ONE, self.enemy);
 	 	//stuffcmd(self, "set viewsize $tmpviewsize \n");
+		self.movetype = MOVETYPE_NONE;
 		if(!SpectateUpdate())
 			PutObserverInServer();
 		return 1;

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2009-07-29 12:51:47 UTC (rev 7280)
+++ trunk/data/qcsrc/server/defs.qh	2009-07-29 19:26:13 UTC (rev 7281)
@@ -610,5 +610,6 @@
 
 .float campingrifle_bulletcounter;
 
-#define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_TRIGGER; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
-// once was: SOLID_BBOX and default dphitcontentsmask, but then stuff can be blocked by them, and they are impacted by spectators
+// #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_TRIGGER; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
+// when doing this, hagar can go through clones
+#define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX