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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-15 04:28:49 -0400 (Tue, 15 Sep 2009)
New Revision: 7796

Modified:
   trunk/data/qcsrc/client/View.qc
Log:
matching clientside changes for trueaim


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-09-15 08:25:30 UTC (rev 7795)
+++ trunk/data/qcsrc/client/View.qc	2009-09-15 08:28:49 UTC (rev 7796)
@@ -209,6 +209,7 @@
 
 vector wcross_origin;
 entity trueaim;
+entity trueaim_rifle;
 
 #define SHOTTYPE_HITTEAM 1
 #define SHOTTYPE_HITOBSTRUCTION 2
@@ -220,6 +221,9 @@
 	trueaim = spawn();
 	trueaim.classname = "trueaim";
 	trueaim.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
+	trueaim_rifle = spawn();
+	trueaim_rifle.classname = "trueaim_rifle";
+	trueaim_rifle.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_CORPSE;
 }
 
 float EnemyHitCheck()
@@ -279,7 +283,10 @@
 
 	vecs = decompressShotOrigin(getstati(STAT_SHOTORG));
 
-	traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, trueaim);
+	if(activeweapon == WEP_CAMPINGRIFLE)
+		traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, trueaim_rifle);
+	else
+		traceline(view_origin, view_origin + view_forward * MAX_SHOT_DISTANCE, MOVE_NOMONSTERS, trueaim);
 	trueaimpoint = trace_endpos;
 
 	if(vecs_x > 0)