Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

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

diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc
index f09f25bdcd13d320e5b9277da55795865d5c3e88..8907a1d32c5a8aa724b71ffbed01f4e521eb3bd4 100644 (file)
--- a/qcsrc/warpzonelib/common.qc
+++ b/qcsrc/warpzonelib/common.qc
@@ -334,6 +334,7 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
 
        o0 = e.origin;
        v0 = e.velocity;
+       g = cvar("sv_gravity") * e.gravity;
 
        WarpZone_trace_forent = forent;
        WarpZone_trace_firstzone = world;
@@ -376,7 +377,6 @@ void WarpZone_TraceToss_ThroughZone(entity e, entity forent, entity zone, WarpZo
                e.velocity = WarpZone_TransformVelocity(wz, e.velocity);
        }
        WarpZone_MakeAllSolid();
-       g = cvar("sv_gravity") * e.gravity;
        i = 16;
        for(;;)
        {
@@ -734,3 +734,17 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
        }
        return e;
 }
+void WarpZone_RefSys_MakeSameRefSys(entity to, entity from)
+{
+       if(from.WarpZone_refsys)
+       {
+               to.WarpZone_refsys = spawn();
+               to.WarpZone_refsys.classname = "warpzone_refsys";
+               to.WarpZone_refsys.owner = to;
+               to.WarpZone_refsys.think = WarpZone_RefSys_GC;
+               to.WarpZone_refsys.nextthink = time + 1;
+               to.WarpZone_refsys.warpzone_shift = from.WarpZone_refsys.warpzone_shift;
+               to.WarpZone_refsys.warpzone_transform = from.WarpZone_refsys.warpzone_transform;
+       }
+       return;
+}