Real fix for crosshair blur not working well while aiming at a teammate and moving...

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 49b0d26d2765343eb7e917722a37906f70078a8f..4b8bc4899a788de78152dec7a1990b56a1de01c0 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -656,6 +656,9 @@ float TrueAimCheck(entity wepent)
 
        traceline(traceorigin, traceorigin + view_forward * max_shot_distance, mv, ta);
        trueaimpoint = trace_endpos;
+       // move trueaimpoint a little bit forward to make the final tracebox reliable
+       // since it sometimes doesn't reach a teammate by a hair
+       trueaimpoint += view_forward;
 
        if(vdist((trueaimpoint - traceorigin), <, g_trueaim_minrange))
                trueaimpoint = traceorigin + view_forward * g_trueaim_minrange;
@@ -672,10 +675,7 @@ float TrueAimCheck(entity wepent)
        tracebox(w_shotorg, mi, ma, w_shotorg + view_forward * (vecs.x + nudge), MOVE_NORMAL, ta); // FIXME this MOVE_NORMAL part will misbehave a little in csqc
        w_shotorg = trace_endpos - view_forward * nudge;
 
-       if (mi == '0 0 0')
-               traceline(w_shotorg, trueaimpoint, MOVE_NORMAL, ta);
-       else
-               tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NORMAL, ta);
+       tracebox(w_shotorg, mi, ma, trueaimpoint, MOVE_NORMAL, ta);
        shottype = EnemyHitCheck();
        if(shottype != SHOTTYPE_HITWORLD)
                return shottype;