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

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 9d6e67b2454f18e44c3fc65ed7144a8acb339dea..b7e91b79729926517449916d55f0cd19d421617c 100644 (file)
--- 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 709fdf0f2291be86bfa6cf53344ddb7ec1bf4295..92c4671f62ec684e17a22b763946968f7c673dcd 100644 (file)
--- 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