General - Use subcomponent macro (CBA 3.16.0) (#9375)

addons/compat_csla/compat_csla_explosives/config.cpp

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};

addons/compat_csla/compat_csla_explosives/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_csla\script_component.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_csla\script_component.hpp"

addons/compat_gm/compat_gm_explosives/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_explosives"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_gm/compat_gm_explosives/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_gm\script_component.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_gm\script_component.hpp"

addons/compat_gm/compat_gm_refuel/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_refuel"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_gm/compat_gm_refuel/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_gm\script_component.hpp"
-
 #define SUBCOMPONENT refuel
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Refuel
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_gm\script_component.hpp"

addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {QGVAR(2b14_carry), QGVAR(nsv_carry), QGVAR(kord_carry), QGVAR(ags30_carry), QGVAR(spg9_carry), QGVAR(spg9m_carry), QGVAR(metis_carry), QGVAR(kornet_carry)};
         requiredVersion = REQUIRED_VERSION;
@@ -13,10 +10,10 @@ class CfgPatches {
             "rhs_main_loadorder",
             "ace_csw"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT csw
+#define SUBCOMPONENT_BEAUTIFIED Crew-Served Weapons
 #include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
 
-#define SUBCOMPONENT csw
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -10,10 +10,10 @@ class CfgPatches {
             "rhs_main_loadorder",
             "ace_explosives"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"

addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\fastroping\script_macros.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -15,6 +12,7 @@ class CfgPatches {
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
+        authors[] = {};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT fastroping
+#define SUBCOMPONENT_BEAUTIFIED Fastroping
 #include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
 
-#define SUBCOMPONENT fastroping
+#include "\z\ace\addons\fastroping\script_macros.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -10,10 +10,10 @@ class CfgPatches {
             "rhs_main_loadorder",
             "ace_nightvision"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
-
 #define SUBCOMPONENT nightvision
-#undef ADDON
+#define SUBCOMPONENT_BEUTIFIEID Night Vision
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"

addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -10,10 +10,10 @@ class CfgPatches {
             "rhs_main_loadorder",
             "ace_refuel"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
-
 #define SUBCOMPONENT refuel
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Refuel
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"

addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -10,10 +10,10 @@ class CfgPatches {
             "rhs_main_loadorder",
             "ace_scopes"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
-
 #define SUBCOMPONENT scopes
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Scopes
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"

addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {QGVAR(dshkm_carry)};
         requiredVersion = REQUIRED_VERSION;
@@ -15,6 +12,7 @@ class CfgPatches {
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
+        authors[] = {};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/compat_rhs_gref3/compat_rhs_gref3_csw/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT csw
+#define SUBCOMPONENT_BEAUTIFIED Crew-Served Weapons
 #include "\z\ace\addons\compat_rhs_gref3\script_component.hpp"
 
-#define SUBCOMPONENT csw
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -12,6 +12,7 @@ class CfgPatches {
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
+        authors[] = {};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/compat_rhs_gref3/compat_rhs_gref3_explosives/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_gref3\script_component.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_gref3\script_component.hpp"

addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\fastroping\script_macros.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -15,6 +12,7 @@ class CfgPatches {
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
+        authors[] = {};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT fastroping
+#define SUBCOMPONENT_BEAUTIFIED Fastroping
 #include "\z\ace\addons\compat_rhs_gref3\script_component.hpp"
 
-#define SUBCOMPONENT fastroping
+#include "\z\ace\addons\fastroping\script_macros.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -10,10 +10,10 @@ class CfgPatches {
             "rhssaf_main_loadorder",
             "ace_explosives"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_saf3/compat_rhs_saf3_explosives/script_component.hpp

@@ -1,10 +1,3 @@
-#define COMPONENT compat_rhs_saf3
-#define COMPONENT_BEAUTIFIED RHS SAF Compatibility
-
-#include "\z\ace\addons\main\script_mod.hpp"
-
-#include "\z\ace\addons\main\script_macros.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_saf3\script_component.hpp"

addons/compat_rhs_saf3/config.cpp

@@ -7,10 +7,10 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"rhssaf_main_loadorder"};
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_rhs_usf3/compat_rhs_usf3_csw/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {QGVAR(m252_carry), QGVAR(m2_carry), QGVAR(mk19_carry), QGVAR(tow_carry)};
         requiredVersion = REQUIRED_VERSION;
@@ -14,7 +11,12 @@ class CfgPatches {
             "ace_csw"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_csw/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT csw
+#define SUBCOMPONENT_BEAUTIFIED Crew-Served Weapons
 #include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
 
-#define SUBCOMPONENT csw
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_usf3/compat_rhs_usf3_explosives/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_explosives"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_explosives/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
-
 #define SUBCOMPONENT explosives
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Explosives
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"

addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/config.cpp

@@ -1,11 +1,8 @@
 #include "script_component.hpp"
 
-// Config will be binerized, so this include is only required at build-time
-#include "\z\ace\addons\fastroping\script_macros.hpp"
-
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        name = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -15,6 +12,7 @@ class CfgPatches {
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
+        authors[] = {};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };

addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/script_component.hpp

@@ -1,5 +1,5 @@
+#define SUBCOMPONENT fastroping
+#define SUBCOMPONENT_BEAUTIFIED Fastroping
 #include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
 
-#define SUBCOMPONENT fastroping
+#include "\z\ace\addons\fastroping\script_macros.hpp"
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)

addons/compat_rhs_usf3/compat_rhs_usf3_javelin/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_javelin"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_javelin/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
-
 #define SUBCOMPONENT javelin
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Javelin
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"

addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_nightvision"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
-
 #define SUBCOMPONENT nightvision
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Night Vision
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"

addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_refuel"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_refuel/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
-
 #define SUBCOMPONENT refuel
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Refuel
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"

addons/compat_rhs_usf3/compat_rhs_usf3_scopes/config.cpp

@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
-        addonRootClass = QUOTE(COMPONENT);
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
@@ -11,7 +11,12 @@ class CfgPatches {
             "ace_scopes"
         };
         skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/compat_rhs_usf3/compat_rhs_usf3_scopes/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"
-
 #define SUBCOMPONENT scopes
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Scopes
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_rhs_usf3\script_component.hpp"

addons/compat_rhs_usf3/config.cpp

@@ -7,10 +7,10 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"rhsusf_main_loadorder"};
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "Fyuran"};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

addons/compat_sog/compat_sog_trenches/config.cpp

@@ -1,14 +1,12 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {
+        requiredAddons[] = {"loadorder_f_vietnam", "ace_trenches"};
-            "loadorder_f_vietnam", "ace_trenches"
-        };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"BaerMitUmlaut", "veteran29"};

addons/compat_sog/compat_sog_trenches/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_sog\script_component.hpp"
-
 #define SUBCOMPONENT trenches
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Trenches
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_sog\script_component.hpp"

addons/compat_sog/compat_sog_trenches_grad/config.cpp

@@ -1,14 +1,12 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {
+        requiredAddons[] = {"loadorder_f_vietnam", "ace_compat_sog_trenches", "grad_trenches_main"};
-            "loadorder_f_vietnam", "ace_compat_sog_trenches", "grad_trenches_main"
-        };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"BaerMitUmlaut", "veteran29"};

addons/compat_sog/compat_sog_trenches_grad/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_sog\script_component.hpp"
-
 #define SUBCOMPONENT trenches_grad
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED Trenches GRAD
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_sog\script_component.hpp"

addons/compat_ws/compat_ws_nouniformrestrictions/config.cpp

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};

addons/compat_ws/compat_ws_nouniformrestrictions/script_component.hpp

@@ -1,5 +1,3 @@
-#include "\z\ace\addons\compat_ws\script_component.hpp"
-
 #define SUBCOMPONENT nouniformrestrictions
-#undef ADDON
+#define SUBCOMPONENT_BEAUTIFIED No Uniform Restrictions
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\compat_ws\script_component.hpp"

addons/huntir/subConfig/config.cpp

@@ -1,9 +1,8 @@
-#include "\z\ace\addons\huntir\script_component.hpp"
+#define SUBCOMPONENT sub
-#undef COMPONENT
+#include "..\script_component.hpp"
-#define COMPONENT huntir_sub
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
@@ -12,6 +11,8 @@ class CfgPatches {
         author = ECSTRING(common,ACETeam);
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };
 

addons/main/script_mod.hpp

@@ -13,8 +13,11 @@
 #define REQUIRED_VERSION 2.14
 #define REQUIRED_CBA_VERSION {3,15,7}
 
-#ifdef COMPONENT_BEAUTIFIED
+#ifndef COMPONENT_BEAUTIFIED
-    #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
+    #define COMPONENT_BEAUTIFIED COMPONENT
-#else
+#endif
-    #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT)
+#ifdef SUBCOMPONENT_BEAUTIFIED
+    #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED - SUBCOMPONENT_BEAUTIFIED)
+#else
+    #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
 #endif

include/x/cba/addons/main/script_macros_common.hpp

@@ -15,7 +15,7 @@
    - Provide a solid structure that can be dynamic and easy editable (Which sometimes means we cannot adhere to Aim #1 ;-)
      An example is the path that is built from defines. Some available in this file, others in mods and addons.
 
- Follows  Standard:
+ Follows Standard:
    Object variables: PREFIX_COMPONENT
    Main-object variables: PREFIX_main
    Paths: MAINPREFIX\PREFIX\SUBPREFIX\COMPONENT\SCRIPTNAME.sqf
@@ -29,6 +29,10 @@
    and include your mod's script_macros.hpp
    In your scripts you can then include the addon's component.hpp with relative path)
 
+   use in subcomponents (subconfigs)
+   define SUBCOMPONENT and include parent component's script_component.hpp
+   currently only supported by SUBADDON, additional macros may be added in the future
+
  TODO:
    - Try only to use 1 string type " vs '
    - Evaluate double functions, and simplification
@@ -54,6 +58,10 @@
 #define ADDON DOUBLES(PREFIX,COMPONENT)
 #define MAIN_ADDON DOUBLES(PREFIX,main)
 
+#ifdef SUBCOMPONENT
+    #define SUBADDON DOUBLES(ADDON,SUBCOMPONENT)
+#endif
+
 /* -------------------------------------------
 Macro: VERSION_CONFIG
     Define CBA Versioning System config entries.