From: Mario <mario@smbclan.net>
Date: Thu, 3 Dec 2015 10:30:26 +0000 (+1000)
Subject: Unpredict warpzones until angle rolling can be fixed
X-Git-Tag: xonotic-v0.8.2~1572
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63fd5dbb9e302fa8e8ef3933a11098cf7706beef;p=xonotic%2Fxonotic-data.pk3dir.git

Unpredict warpzones until angle rolling can be fixed
---

diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index 3eaba332a..e33a72b1e 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 4540dab4f..b97d58ca0 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