From 6a60cda57561a95c621726b1749158c52e5d68da Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 20 Oct 2019 19:32:17 +0200 Subject: [PATCH] Real fix for crosshair blur not working well while aiming at a teammate and moving crosshair (this commit reverts de9801a2 as it hasn't worked) --- qcsrc/client/view.qc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 49b0d26d27..4b8bc4899a 100644 --- 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; -- 2.39.2