Revert "more hopefully unused globals"

This reverts commit 56c279771cb4307afca3afbb4f28aee96eb015bb.

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index 2c491cab9809d9b875ad739d3d92971280a3e01f..e7bca6ffc0c88fd070e6015299e0ac13ebb543c9 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -334,7 +334,7 @@ void WarpZone_TraceLine(vector org, vector end, float nomonsters, entity forent)
 void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZone_trace_callback_t cb)
 {
        float g, dt, i;
-       vector v0, o0;
+       vector vf, vr, vu, v0, o0;
        entity wz;
 
        o0 = e.origin;
@@ -359,6 +359,10 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
                return;
        }
 
+       vf = v_forward;
+       vr = v_right;
+       vu = v_up;
+
        // if starting in warpzone, first transform
        wz = WarpZone_Find(e.origin + e.mins, e.origin + e.maxs);
        if(wz)
@@ -428,6 +432,9 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
        WarpZone_MakeAllOther();
 LABEL(fail)
        WarpZone_tracetoss_velocity = e.velocity;
+       v_forward = vf;
+       v_right = vr;
+       v_up = vu;
        // restore old entity data (caller just uses trace_endpos, WarpZone_tracetoss_velocity and the transform)
        e.velocity = v0;
        e.origin = o0;