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

acemod · Sep 12, 2023 · 7cbdb7f · 7cbdb7f
1 parent ebef82d
commit 7cbdb7f
Show file tree

Hide file tree

Showing 51 changed files with 169 additions and 173 deletions.
diff --git a/addons/compat_csla/compat_csla_explosives/config.cpp b/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[] = {};

diff --git a/addons/compat_csla/compat_csla_explosives/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "\z\ace\addons\compat_csla\script_component.hpp"
diff --git a/addons/compat_gm/compat_gm_explosives/config.cpp b/addons/compat_gm/compat_gm_explosives/config.cpp
@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        addonRootClass = QUOTE(COMPONENT);
+    class SUBADDON {
+        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);
     };
 };
 

diff --git a/addons/compat_gm/compat_gm_explosives/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "\z\ace\addons\compat_gm\script_component.hpp"
diff --git a/addons/compat_gm/compat_gm_refuel/config.cpp b/addons/compat_gm/compat_gm_refuel/config.cpp
@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        addonRootClass = QUOTE(COMPONENT);
+    class SUBADDON {
+        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);
     };
 };
 

diff --git a/addons/compat_gm/compat_gm_refuel/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Refuel
+#include "\z\ace\addons\compat_gm\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp
@@ -1,22 +1,19 @@
 #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 {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        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;
         requiredAddons[] = {
             "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;
     };
 };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/script_component.hpp b/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
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp
@@ -1,19 +1,19 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "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;
     };
 };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp b/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 {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        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;
     };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/script_component.hpp b/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
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\fastroping\script_macros.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp
@@ -1,19 +1,19 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "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;
     };
 };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEUTIFIEID Night Vision
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
@@ -1,19 +1,19 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "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;
     };
 };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Refuel
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp
@@ -1,19 +1,19 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "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;
     };
 };

diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Scopes
+#include "\z\ace\addons\compat_rhs_afrf3\script_component.hpp"
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp b/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 {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        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;
     };

diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/script_component.hpp b/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
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\csw\script_config_macros_csw.hpp"
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp
@@ -1,8 +1,8 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        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;
     };

diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "\z\ace\addons\compat_rhs_gref3\script_component.hpp"
diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp b/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 {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        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;
     };

diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/script_component.hpp b/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
-#undef ADDON
-#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#include "\z\ace\addons\fastroping\script_macros.hpp"
diff --git a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp
@@ -1,19 +1,19 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
-        name = QUOTE(COMPONENT);
+    class SUBADDON {
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "rhssaf_main_loadorder",
             "ace_explosives"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {};
         url = ECSTRING(main,URL);
-        skipWhenMissingDependencies = 1;
         VERSION_CONFIG;
     };
 };

diff --git a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/script_component.hpp b/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 ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT)
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "\z\ace\addons\compat_rhs_saf3\script_component.hpp"