Unpredict warpzones until angle rolling can be fixed

diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index 3eaba332aec26dfcc37aa62e6826db5c7ffe0455..e33a72b1ed9830403468e61e27f251cba3708094 100644 (file)
--- a/qcsrc/lib/warpzone/client.qc
+++ b/qcsrc/lib/warpzone/client.qc
@@ -89,7 +89,7 @@ NET_HANDLE(ENT_CLIENT_WARPZONE, bool isnew)
        // engine currently wants this
        self.predraw = WarpZone_Fade_PreDraw;
 
-       self.move_touch = WarpZone_Touch;
+       //self.move_touch = WarpZone_Touch;
        return true;
 }
 

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 4540dab4f2eb6194144c33b355e2ef01d671bca5..b97d58ca0cbe337925bfe7655d8a87c60f862ace 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -95,7 +95,7 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1)
        o10 = o1 = WarpZone_TransformOrigin(wz, o0);
        v1 = WarpZone_TransformVelocity(wz, v0);
        if (!IS_NOT_A_CLIENT(player))
-               a1 = WarpZone_TransformVAngles(wz, player.v_angle);
+               a1 = WarpZone_TransformVAngles(wz, PHYS_INPUT_ANGLES(player));
        else
                a1 = WarpZone_TransformAngles(wz, a0);
 
@@ -178,8 +178,8 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1)
        }
        #elif defined(CSQC)
        setproperty(VF_CL_VIEWANGLES, WarpZone_TransformVAngles(wz, getpropertyvec(VF_CL_VIEWANGLES)));
-       if(checkextension("DP_CSQC_ROTATEMOVES"))
-               CL_RotateMoves(wz.warpzone_transform);
+       //if(checkextension("DP_CSQC_ROTATEMOVES"))
+               //CL_RotateMoves(wz.warpzone_transform);
        #endif
 #endif