From 9bf1d96b3f6ef5ab1a2dba1f4581a1dc2f38bbdb Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 28 Feb 2010 19:43:27 +0000 Subject: [PATCH] warpzone: fix nex shot origin git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8700 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/warpzonelib/common.qc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/warpzonelib/common.qc b/data/qcsrc/warpzonelib/common.qc index 1c6ae996c..d0c3777d5 100644 --- a/data/qcsrc/warpzonelib/common.qc +++ b/data/qcsrc/warpzonelib/common.qc @@ -85,9 +85,13 @@ void WarpZone_TraceBox(vector org, vector mi, vector ma, vector end, float nomon { float frac, sol; vector o0, e0; + vector vf, vr, vu; + vf = v_forward; + vr = v_right; + vu = v_up; + WarpZone_MakeAllSolid(); o0 = org; e0 = end; - WarpZone_MakeAllSolid(); sol = -1; frac = 0; for(;;) @@ -106,6 +110,9 @@ void WarpZone_TraceBox(vector org, vector mi, vector ma, vector end, float nomon } WarpZone_MakeAllOther(); WarpZone_trace_endpos = o0 + (e0 - o0) * trace_fraction; + v_forward = vf; + v_right = vr; + v_up = vu; } void WarpZone_TraceLine(vector org, vector end, float nomonsters, entity forent) @@ -116,6 +123,10 @@ void WarpZone_TraceLine(vector org, vector end, float nomonsters, entity forent) void WarpZone_TrailParticles(entity own, float eff, vector org, vector end) { float frac, sol; + vector vf, vr, vu; + vf = v_forward; + vr = v_right; + vu = v_up; WarpZone_MakeAllSolid(); sol = -1; frac = 0; @@ -135,6 +146,9 @@ void WarpZone_TrailParticles(entity own, float eff, vector org, vector end) end = WarpZone_TransformOrigin(trace_ent, end); } WarpZone_MakeAllOther(); + v_forward = vf; + v_right = vr; + v_up = vu; } vector WarpZone_TransformOrigin(entity wz, vector v) -- 2.39.2