From 63fd5dbb9e302fa8e8ef3933a11098cf7706beef Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 3 Dec 2015 20:30:26 +1000 Subject: [PATCH] Unpredict warpzones until angle rolling can be fixed --- qcsrc/lib/warpzone/client.qc | 2 +- qcsrc/lib/warpzone/server.qc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc index 3eaba332ae..e33a72b1ed 100644 --- 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 4540dab4f2..b97d58ca0c 100644 --- 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 -- 2.39.2