From 024596a764d538ca0c779ff700417fcd4e5ba760 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 28 Feb 2010 19:44:48 +0000 Subject: [PATCH] minor code cleanup; mark bug as todo git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8716 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/warpzonelib/TODO | 1 + data/qcsrc/warpzonelib/common.qc | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/warpzonelib/TODO b/data/qcsrc/warpzonelib/TODO index 8c5c4a518..5c9a55fc1 100644 --- a/data/qcsrc/warpzonelib/TODO +++ b/data/qcsrc/warpzonelib/TODO @@ -1,5 +1,6 @@ Open issues: - grep for TODO and FIXME +- when shot origin is inside warpzone, nex shot fails (and is even drawn in totally wrong direction). WHY? Possibly v_forward got lost? Weapon support: diff --git a/data/qcsrc/warpzonelib/common.qc b/data/qcsrc/warpzonelib/common.qc index 52e708643..5186830c3 100644 --- a/data/qcsrc/warpzonelib/common.qc +++ b/data/qcsrc/warpzonelib/common.qc @@ -98,6 +98,8 @@ void WarpZone_TraceBox(vector org, vector mi, vector ma, vector end, float nomon vf = v_forward; vr = v_right; vu = v_up; + o0 = org; + e0 = end; // if starting in warpzone, first transform wz = WarpZone_Find(org + mi, org + ma); if(wz) @@ -109,8 +111,6 @@ void WarpZone_TraceBox(vector org, vector mi, vector ma, vector end, float nomon WarpZone_trace_v_angle = WarpZone_TransformVAngles(wz, WarpZone_trace_v_angle); } WarpZone_MakeAllSolid(); - o0 = org; - e0 = end; sol = -1; frac = 0; for(;;) @@ -155,6 +155,8 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end, vf = v_forward; vr = v_right; vu = v_up; + o0 = org; + e0 = end; // if starting in warpzone, first transform wz = WarpZone_Find(org + mi, org + ma); if(wz) @@ -174,8 +176,6 @@ void WarpZone_TraceBox_ThroughZone(vector org, vector mi, vector ma, vector end, WarpZone_trace_v_angle = WarpZone_TransformVAngles(wz, WarpZone_trace_v_angle); } WarpZone_MakeAllSolid(); - o0 = org; - e0 = end; sol = -1; frac = 0; for(;;) @@ -227,6 +227,8 @@ void WarpZone_TraceToss(entity e, entity forent) vf = v_forward; vr = v_right; vu = v_up; + v0 = e.velocity; + o0 = e.origin; // if starting in warpzone, first transform wz = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs); if(wz) @@ -237,8 +239,6 @@ void WarpZone_TraceToss(entity e, entity forent) WarpZone_MakeAllSolid(); g = cvar("sv_gravity") * e.gravity; WarpZone_tracetoss_time = 0; - v0 = e.velocity; - o0 = e.origin; for(;;) { tracetoss(e, forent); -- 2.39.2