r3564 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Mar 31 07:38:03 EDT 2008


Author: lordhavoc
Date: 2008-03-31 07:38:01 -0400 (Mon, 31 Mar 2008)
New Revision: 3564

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
generalized div0's fix for playerclip messing up trueaim, now all the
tracelines in W_SetupShot are with a SOLID_BBOX player entity


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-03-31 11:30:12 UTC (rev 3563)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-03-31 11:38:01 UTC (rev 3564)
@@ -26,7 +26,10 @@
 {
 	float nudge = 1; // added to traceline target and subtracted from result
 	local vector trueaimpoint;
-	traceline_antilag(self, self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, self, 0);
+	local float oldsolid;
+	oldsolid = self.solid;
+	self.solid = SOLID_BBOX; // make all shot test traces bypass playerclip
+	traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, self);
 	trueaimpoint = trace_endpos;
 
 	if (cvar("g_shootfromeye"))
@@ -110,6 +113,8 @@
 		}
 	}
 
+	self.solid = oldsolid; // restore solid type (generally SOLID_SLIDEBOX)
+
 	if (!g_norecoil)
 		self.punchangle_x = recoil * -1;
 




More information about the nexuiz-commits mailing list