Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General - Use subcomponent macro (CBA 3.16.0) #9375

Merged
merged 8 commits into from
Sep 12, 2023
Merged

General - Use subcomponent macro (CBA 3.16.0) #9375

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cdcbeef
Use subcomponent macro (CBA 3.16.0)
jonpas Sep 8, 2023
14e048c
Streamline all subconfig CfgPatches
jonpas Sep 8, 2023
66d9f1c
Use SUBADDON
jonpas Sep 8, 2023
89a1b94
Move CSW and Fastroping includes to script_component.hpp
jonpas Sep 8, 2023
7a8ec88
HuntIR - Use subcomponent macro in subconfig
jonpas Sep 9, 2023
e04700a
Update CBA include
jonpas Sep 9, 2023
8bb447e
Flat defines
jonpas Sep 9, 2023
b607d74
Fix subcomponent `addonRootClass`
jonpas Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/compat_csla/compat_csla_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
class SUBADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_csla/compat_csla_explosives/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 7 additions & 2 deletions addons/compat_gm/compat_gm_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +11,12 @@ class CfgPatches {
"ace_explosives"
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;

addonRootClass = QUOTE(COMPONENT);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding this, I am not sure if we want it?

CfgPatches wiki page says:

To make configuration of meta data simpler, you can simply create a link to the root class instead of defining name, author and url again. A good practice is to have all configs withing one PBO to use the same meta data.

But some of our compats might be better off requiring a subcomponent specifically?

};
};

Expand Down
6 changes: 2 additions & 4 deletions addons/compat_gm/compat_gm_explosives/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 7 additions & 2 deletions addons/compat_gm/compat_gm_refuel/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,7 +11,12 @@ class CfgPatches {
"ace_refuel"
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;

addonRootClass = QUOTE(COMPONENT);
};
};

Expand Down
6 changes: 2 additions & 4 deletions addons/compat_gm/compat_gm_refuel/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 3 additions & 6 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 3 additions & 5 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,6 +12,7 @@ class CfgPatches {
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
Expand Down
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 3 additions & 5 deletions addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,6 +12,7 @@ class CfgPatches {
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
Expand Down
6 changes: 3 additions & 3 deletions addons/compat_rhs_gref3/compat_rhs_gref3_csw/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 3 additions & 2 deletions addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,6 +12,7 @@ class CfgPatches {
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
Expand Down
6 changes: 2 additions & 4 deletions addons/compat_rhs_gref3/compat_rhs_gref3_explosives/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 3 additions & 5 deletions addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,6 +12,7 @@ class CfgPatches {
};
skipWhenMissingDependencies = 1;
author = ECSTRING(common,ACETeam);
authors[] = {};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
Expand Down
6 changes: 3 additions & 3 deletions addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
11 changes: 2 additions & 9 deletions addons/compat_rhs_saf3/compat_rhs_saf3_explosives/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Loading