Add macros to skip adding headers to cfgFunctions (#1065)

* Add macros to skip adding headers to cfgFunctions * Move to script_mod * Cleanup vectors * cleanup
CBATeam · Feb 16, 2019 · d6cbc0f · d6cbc0f
1 parent b1dbeff
commit d6cbc0f
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 12 deletions.
diff --git a/addons/main/script_macros_common.hpp b/addons/main/script_macros_common.hpp
@@ -942,6 +942,7 @@ Macro: PATHTO_FNC()
     Full file path in addons:
         '\MAINPREFIX\PREFIX\SUBPREFIX\COMPONENT\fnc_<FNC>.sqf'
     Define 'RECOMPILE' to enable recompiling.
+    Define 'SKIP_FUNCTION_HEADER' to skip adding function header.
 
 Parameters:
     FUNCTION NAME - Name of the function, unquoted <STRING>
@@ -968,9 +969,16 @@ Macro: PATHTO_FNC()
 #else
     #define RECOMPILE recompile = 0
 #endif
+// Set function header type: -1 - no header; 0 - default header; 1 - system header.
+#ifdef SKIP_FUNCTION_HEADER
+    #define CFGFUNCTION_HEADER headerType = -1
+#else
+    #define CFGFUNCTION_HEADER headerType = 0
+#endif
 
 #define PATHTO_FNC(func) class func {\
     file = QPATHTOF(DOUBLES(fnc,func).sqf);\
+    CFGFUNCTION_HEADER;\
     RECOMPILE;\
 }
 
@@ -1119,6 +1127,7 @@ Macros: IS_x()
 /* -------------------------------------------
 Macro: SCRIPT()
     Sets name of script (relies on PREFIX and COMPONENT values being #defined).
+    Define 'SKIP_SCRIPT_NAME' to skip adding scriptName.
 
 Parameters:
     NAME - Name of script [Indentifier]
@@ -1131,8 +1140,11 @@ Macro: SCRIPT()
 Author:
     Spooner
 ------------------------------------------- */
-#define SCRIPT(NAME) \
-    scriptName 'PREFIX\COMPONENT\NAME'
+#ifndef SKIP_SCRIPT_NAME
+    #define SCRIPT(NAME) scriptName 'PREFIX\COMPONENT\NAME'
+#else
+    #define SCRIPT(NAME) /* nope */
+#endif
 
 /* -------------------------------------------
 Macros: EXPLODE_n()

diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -29,3 +29,7 @@
     #define DEBUG_ENABLED_STRINGS
     #define DEBUG_ENABLED_VERSIONING
 */
+
+// Remove CfgFunction adding headers and disable SCRIPT macro (comment out to enable for debugging)
+#define SKIP_FUNCTION_HEADER
+#define SKIP_SCRIPT_NAME
diff --git a/addons/vectors/fnc_polar2vect.sqf b/addons/vectors/fnc_polar2vect.sqf
@@ -21,7 +21,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_polar2vect.sqf";
 
 SCRIPT(polar2vect);
 

diff --git a/addons/vectors/fnc_scaleVect.sqf b/addons/vectors/fnc_scaleVect.sqf
@@ -20,7 +20,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_scaleVect.sqf";
 
 SCRIPT(scaleVect);
 

diff --git a/addons/vectors/fnc_scaleVectTo.sqf b/addons/vectors/fnc_scaleVectTo.sqf
@@ -22,7 +22,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_scaleVectTo.sqf";
 
 SCRIPT(scaleVectTo);
 

diff --git a/addons/vectors/fnc_vect2polar.sqf b/addons/vectors/fnc_vect2polar.sqf
@@ -20,7 +20,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vect2Polar.sqf";
 
 SCRIPT(vect2Polar);
 

diff --git a/addons/vectors/fnc_vectCross2D.sqf b/addons/vectors/fnc_vectCross2D.sqf
@@ -23,7 +23,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectCross2D.sqf";
 
 SCRIPT(vectCross2D);
 

diff --git a/addons/vectors/fnc_vectDir.sqf b/addons/vectors/fnc_vectDir.sqf
@@ -19,7 +19,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectDir.sqf";
 
 SCRIPT(vectDir);
 

diff --git a/addons/vectors/fnc_vectElev.sqf b/addons/vectors/fnc_vectElev.sqf
@@ -19,7 +19,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectElev.sqf";
 
 SCRIPT(vectElev);
 

diff --git a/addons/vectors/fnc_vectMagn.sqf b/addons/vectors/fnc_vectMagn.sqf
@@ -19,7 +19,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectMagn.sqf";
 
 SCRIPT(vectMagn);
 

diff --git a/addons/vectors/fnc_vectMagn2D.sqf b/addons/vectors/fnc_vectMagn2D.sqf
@@ -19,7 +19,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectMagn2D.sqf";
 
 SCRIPT(vectMagn2D);
 

diff --git a/addons/vectors/fnc_vectSubtract.sqf b/addons/vectors/fnc_vectSubtract.sqf
@@ -20,7 +20,6 @@ Examples:
 Author:
     Vigilante, courtesy by -=ACE=- of Simcentric
 ---------------------------------------------------------------------------- */
-scriptName "fnc_vectSubtract.sqf";
 
 SCRIPT(vectSubtract);