s/make_pure/new_pure/

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / common.qc

diff --git a/qcsrc/lib/warpzone/common.qc b/qcsrc/lib/warpzone/common.qc
index 0f898c3401b1b41df7b15ad1bcc717600f4a8002..b3332f36f464dde5e067a455c8eedc37606ac9e0 100644 (file)
--- a/qcsrc/lib/warpzone/common.qc
+++ b/qcsrc/lib/warpzone/common.qc
@@ -1,10 +1,10 @@
 #include "common.qh"
 
 #if defined(CSQC)
-    #include "../../server/t_items.qh"
+    #include <common/t_items.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../../common/weapons/all.qh"
+    #include <common/weapons/all.qh>
 #endif
 
 void WarpZone_Accumulator_Clear(entity acc)
@@ -43,7 +43,7 @@ vector WarpZone_camera_transform(vector org, vector ang)
 {SELFPARAM();
        vector vf, vr, vu;
        if(self.warpzone_fadestart)
-               if(vlen(org - self.origin - 0.5 * (self.mins + self.maxs)) > self.warpzone_fadeend + 400)
+               if(vdist(org - self.origin - 0.5 * (self.mins + self.maxs), >, self.warpzone_fadeend + 400))
                        return org;
                        // don't transform if zone faded out (plus 400qu safety margin for typical speeds and latencies)
                        // unneeded on client, on server this helps a lot
@@ -81,7 +81,7 @@ vector WarpZone_Camera_camera_transform(vector org, vector ang)
 {SELFPARAM();
        // a fixed camera view
        if(self.warpzone_fadestart)
-               if(vlen(org - self.origin - 0.5 * (self.mins + self.maxs)) > self.warpzone_fadeend + 400)
+               if(vdist(org - self.origin - 0.5 * (self.mins + self.maxs), >, self.warpzone_fadeend + 400))
                        return org;
                        // don't transform if zone faded out (plus 400qu safety margin for typical speeds and latencies)
                        // unneeded on client, on server this helps a lot
@@ -186,8 +186,7 @@ void WarpZone_Trace_InitTransform()
 {
        if(!WarpZone_trace_transform)
        {
-               WarpZone_trace_transform = new(warpzone_trace_transform);
-               make_pure(WarpZone_trace_transform);
+               WarpZone_trace_transform = new_pure(warpzone_trace_transform);
        }
        WarpZone_Accumulator_Clear(WarpZone_trace_transform);
 }
@@ -387,7 +386,8 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
                        goto fail;
                }
                WarpZone_Trace_AddTransform(wz);
-               setorigin(e, WarpZone_TransformOrigin(wz, e.origin));
+               vector org = WarpZone_TransformOrigin(wz, e.origin);
+               setorigin(e, org);
                e.velocity = WarpZone_TransformVelocity(wz, e.velocity);
        }
        WarpZone_MakeAllSolid();
@@ -615,7 +615,7 @@ void WarpZone_FindRadius_Recurse(vector org, float rad,        vector org0,
                        if(trace_fraction < 1)
                                continue;
                }
-               if(!e.WarpZone_findradius_hit || vlen(e.WarpZone_findradius_dist) > vlen(org0 - p))
+               if(!e.WarpZone_findradius_hit || vlen2(e.WarpZone_findradius_dist) > vlen2(org0 - p))
                {
                        e.WarpZone_findradius_nearest = p;
                        e.WarpZone_findradius_dist = org0 - p;