From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 12 Nov 2018 19:57:40 +0000 (+0100)
Subject: Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data... 
X-Git-Tag: xonotic-v0.8.5~1258^2~44
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=ac4f809419574ad8c2f10bc0531b303ed98c109f;hp=0a85e9a4a6c81d4776f1d9dbd93ace1442742bbd;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/globals' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into martin-t/globals
---

diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
index 9d6e67b24..b7e91b797 100644
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc
@@ -106,15 +106,12 @@ MUTATOR_HOOKFUNCTION(spawn_near_teammate, PlayerSpawn)
 			vector forward = '0 0 0';
 			vector right = '0 0 0';
 			vector up = '0 0 0';
-			// TODO ^ test this
 			if (vdist(horiz_vel, >, autocvar_sv_maxspeed + 50))
 			{
-				//fixedmakevectors(vectoangles(horiz_vel));
 				FIXED_MAKE_VECTORS(vectoangles(horiz_vel), forward, right, up);
 			}
 			else
 			{
-				//fixedmakevectors(it.angles); // .angles is the angle of the model - usually/always 0 pitch
 				FIXED_MAKE_VECTORS(it.angles, forward, right, up);
 			}
 
diff --git a/qcsrc/lib/warpzone/anglestransform.qh b/qcsrc/lib/warpzone/anglestransform.qh
index 709fdf0f2..92c4671f6 100644
--- a/qcsrc/lib/warpzone/anglestransform.qh
+++ b/qcsrc/lib/warpzone/anglestransform.qh
@@ -19,7 +19,20 @@
         a.x = -a.x;
         makevectors(a);
     }
-    // TODO deglobalize
+    #define FIXED_MAKE_VECTORS(angles, forward, right, up) MACRO_BEGIN { \
+        fixedmakevectors(angles); \
+        forward = v_forward; \
+        right = v_right; \
+        up = v_up; \
+        v_forward = VEC_NAN; \
+        v_right = VEC_NAN; \
+        v_up = VEC_NAN; \
+    } MACRO_END
+    #define FIXED_MAKE_VECTORS_NEW(angles, forward, right, up) \
+        vector forward = '0 0 0'; \
+        vector right = '0 0 0'; \
+        vector up = '0 0 0'; \
+        FIXED_MAKE_VECTORS(angles, forward, right, up);
     #define fixedvectoangles2 vectoangles2
     #define fixedvectoangles vectoangles
 #endif