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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-05 15:40:27 -0400 (Tue, 05 May 2009)
New Revision: 6675

Modified:
   trunk/data/qcsrc/client/View.qc
Log:
fix trueaim check for rifle, it accidentally used the rocket's thickness for the bullet


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-05-05 18:10:07 UTC (rev 6674)
+++ trunk/data/qcsrc/client/View.qc	2009-05-05 19:40:27 UTC (rev 6675)
@@ -223,6 +223,7 @@
 		case WEP_CAMPINGRIFLE:
 			if(zoomscript_caught)
 				return 1; // shoots from eye when zoomed
+			break;
 		case WEP_ROCKET_LAUNCHER: // projectile has a size!
 			mi = '-3 -3 -3';
 			ma = '3 3 3';
@@ -248,9 +249,10 @@
 	// now move the vecs forward as much as requested if possible
 	traceline(w_shotorg, w_shotorg + view_forward * (vecs_x + nudge), MOVE_NORMAL, trueaim); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
 	w_shotorg = trace_endpos - view_forward * nudge;
-
+	
 	// now test whether we will actually hit the trueaimpoint...
 	tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NOMONSTERS, trueaim);
+
 	return vlen(trace_endpos - trueaimpoint) <= vlen(ma - mi) + 1;
 		// yes, this is an ugly hack... but it seems good enough to find out whether the test hits the same place as the initial trace
 }