Merge pull request #5731 from acemod/macro-fix

Fixes bugs in the new (macro based) mrad/moa conversion
acemod · Nov 6, 2017 · 4ea1d38 · 4ea1d38
2 parents 1044fcc + 00d1cf8
commit 4ea1d38
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/addons/atragmx/functions/fnc_calculate_truing_drop.sqf b/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
@@ -46,8 +46,8 @@ if (_parseInput) then {
     };
     switch (_dropUnit) do {
         case 0: {
-            _transonicDrop = MOA_TO_MRAD(_transonicDrop);
-            _subsonicDrop  = MOA_TO_MRAD(_subsonicDrop);
+            _transonicDrop = MRAD_TO_MOA(_transonicDrop);
+            _subsonicDrop  = MRAD_TO_MOA(_subsonicDrop);
         };
         case 2: {
             _transonicDrop = _transonicDrop / 1.047;

diff --git a/addons/atragmx/script_component.hpp b/addons/atragmx/script_component.hpp
@@ -16,11 +16,4 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
-#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
-#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
-#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
-#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9
-#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
-
 #define ATRAGMX_PROFILE_NAMESPACE_VERSION 2.2
diff --git a/addons/ballistics/script_component.hpp b/addons/ballistics/script_component.hpp
@@ -15,5 +15,3 @@
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
-
-#define MOA_TO_RAD(d) (d * 0.00029088) // Conversion factor: PI / 10800
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
@@ -109,4 +109,13 @@
    #define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) /* disabled */
 #endif
 
+// Angular unit conversion
+#define MRAD_TO_MOA(d) ((d) * 3.43774677) // Conversion factor: 54 / (5 * PI)
+#define MOA_TO_MRAD(d) ((d) * 0.29088821) // Conversion factor: (5 * PI) / 54
+#define DEG_TO_MOA(d) ((d) * 60) // Conversion factor: 60
+#define MOA_TO_DEG(d) ((d) / 60) // Conversion factor: 1 / 60
+#define DEG_TO_MRAD(d) ((d) * 17.45329252) // Conversion factor: (50 * PI) / 9
+#define MRAD_TO_DEG(d) ((d) / 17.45329252) // Conversion factor: 9 / (50 * PI)
+#define MOA_TO_RAD(d) ((d) * 0.00029088) // Conversion factor: PI / 10800
+
 #include "script_debug.hpp"
diff --git a/addons/rangecard/script_component.hpp b/addons/rangecard/script_component.hpp
@@ -15,10 +15,3 @@
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
-
-#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
-#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
-#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
-#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
-#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9
-#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
diff --git a/addons/scopes/script_component.hpp b/addons/scopes/script_component.hpp
@@ -22,6 +22,4 @@
     #define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES
 #endif
 
-#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
-
 #include "\z\ace\addons\main\script_macros.hpp"