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 b287651a10a4fb868acdfeca18d2c0dfaf77b4d0..c11a63185f8090d3348d1cc7e720f30751cc2d4e 100644 (file)
--- a/qcsrc/lib/warpzone/anglestransform.qh
+++ b/qcsrc/lib/warpzone/anglestransform.qh
@@ -6,6 +6,8 @@
 
 #if POSITIVE_PITCH_IS_DOWN
     #define fixedmakevectors makevectors
 
 #if POSITIVE_PITCH_IS_DOWN
     #define fixedmakevectors makevectors

+    #define FIXED_MAKE_VECTORS MAKE_VECTORS
+    #define FIXED_MAKE_VECTORS_NEW MAKE_VECTORS_NEW

     noref vector _fixedvectoangles;
     #define fixedvectoangles(a) (_fixedvectoangles = vectoangles(a), _fixedvectoangles.x *= -1, _fixedvectoangles)
     noref vector _fixedvectoangles2;
     noref vector _fixedvectoangles;
     #define fixedvectoangles(a) (_fixedvectoangles = vectoangles(a), _fixedvectoangles.x *= -1, _fixedvectoangles)
     noref vector _fixedvectoangles2;


@@ -17,6 +19,14 @@
         a.x = -a.x;
         makevectors(a);
     }
         a.x = -a.x;
         makevectors(a);
     }

+    #define FIXED_MAKE_VECTORS(angles, forward, right, up) MACRO_BEGIN \
+        fixedmakevectors(angles); \
+        GET_V_GLOBALS(forward, right, up); \
+        CLEAR_V_GLOBALS(); \
+    MACRO_END
+    #define FIXED_MAKE_VECTORS_NEW(angles, forward, right, up) \
+        VECS_NEW(forward, right, up); \
+        FIXED_MAKE_VECTORS(angles, forward, right, up);

     #define fixedvectoangles2 vectoangles2
     #define fixedvectoangles vectoangles
 #endif
     #define fixedvectoangles2 vectoangles2
     #define fixedvectoangles vectoangles
 #endif