From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 14 Nov 2018 18:45:11 +0000 (+0100)
Subject: deglob wzl/server.qc
X-Git-Tag: xonotic-v0.8.5~1258^2~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=407a44c63b08ce91c669b5ff346f4ea54267e3e3;p=xonotic%2Fxonotic-data.pk3dir.git

deglob wzl/server.qc
---

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 2805c0050..1f2470948 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -595,15 +595,15 @@ void WarpZone_InitStep_UpdateTransform(entity this)
 		if(area > 0)
 		{
 			org = org - ((org - point) * norm) * norm; // project to plane
-			makevectors(ang);
-			if(norm * v_forward < 0)
+			MAKE_VECTORS_NEW(ang, forward, right, up);
+			if(norm * forward < 0)
 			{
 				LOG_INFO("Position target of trigger_warpzone near ", vtos(this.aiment.origin), " points into trigger_warpzone. BEWARE.");
 				norm = -1 * norm;
 			}
-			ang = vectoangles2(norm, v_up); // keep rotation, but turn exactly against plane
+			ang = vectoangles2(norm, up); // keep rotation, but turn exactly against plane
 			ang.x = -ang.x;
-			if(norm * v_forward < 0.99)
+			if(norm * forward < 0.99)
 				LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been turned to match plane orientation (", vtos(this.aiment.angles), " -> ", vtos(ang));
 			if(vdist(org - this.aiment.origin, >, 0.5))
 				LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been moved to match the plane (", vtos(this.aiment.origin), " -> ", vtos(org), ").");