Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / anglestransform.qh

diff --git a/qcsrc/lib/warpzone/anglestransform.qh b/qcsrc/lib/warpzone/anglestransform.qh
index 92c4671f62ec684e17a22b763946968f7c673dcd..c11a63185f8090d3348d1cc7e720f30751cc2d4e 100644 (file)
--- a/qcsrc/lib/warpzone/anglestransform.qh
+++ b/qcsrc/lib/warpzone/anglestransform.qh
@@ -19,19 +19,13 @@
         a.x = -a.x;
         makevectors(a);
     }
-    #define FIXED_MAKE_VECTORS(angles, forward, right, up) MACRO_BEGIN { \
+    #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
+        GET_V_GLOBALS(forward, right, up); \
+        CLEAR_V_GLOBALS(); \
+    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'; \
+        VECS_NEW(forward, right, up); \
         FIXED_MAKE_VECTORS(angles, forward, right, up);
     #define fixedvectoangles2 vectoangles2
     #define fixedvectoangles vectoangles