From 66d1038c6c1da54368d9a4822ca798ceee5e8d01 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 9 Sep 2023 21:24:26 +0200 Subject: [PATCH] General - Use subcomponent macro (#139) Co-authored-by: Mike-MF --- addons/african_militia/config.cpp | 1 + addons/african_militia/subconfig_ace/config.cpp | 5 +++-- .../african_militia/subconfig_ace/script_component.hpp | 7 +++---- addons/african_militia/subconfig_cup/config.cpp | 5 +++-- .../african_militia/subconfig_cup/script_component.hpp | 7 +++---- addons/african_north/config.cpp | 1 + addons/african_south/config.cpp | 1 + addons/african_south/subconfig_ace/config.cpp | 5 +++-- addons/african_south/subconfig_ace/script_component.hpp | 7 +++---- addons/african_south/subconfig_cup/config.cpp | 5 +++-- addons/african_south/subconfig_cup/script_component.hpp | 7 +++---- addons/ammunition/config.cpp | 1 + addons/ammunition/subconfig_CUP/script_component.hpp | 5 ----- .../{subconfig_CUP => subconfig_cup}/CfgAmmo.hpp | 0 .../CfgMagazineWells.hpp | 0 .../{subconfig_CUP => subconfig_cup}/CfgMagazines.hpp | 0 .../{subconfig_CUP => subconfig_cup}/CfgWeapons.hpp | 0 .../{subconfig_CUP => subconfig_cup}/config.cpp | 5 +++-- addons/ammunition/subconfig_cup/script_component.hpp | 3 +++ addons/assets/config.cpp | 1 + addons/assets/subconfig_cup/config.cpp | 5 +++-- addons/assets/subconfig_cup/script_component.hpp | 8 +++----- addons/baf/config.cpp | 1 + addons/baf/subconfig_ace/config.cpp | 5 +++-- addons/baf/subconfig_ace/script_component.hpp | 7 +++---- addons/baf/subconfig_cup/config.cpp | 5 +++-- addons/baf/subconfig_cup/script_component.hpp | 7 +++---- addons/cartel_greek/config.cpp | 1 + addons/faction_overwrites/config.cpp | 1 + addons/faction_overwrites/subconfig_cup/config.cpp | 5 +++-- .../subconfig_cup/script_component.hpp | 7 +++---- addons/faction_overwrites/subconfig_mu/config.cpp | 5 +++-- .../faction_overwrites/subconfig_mu/script_component.hpp | 7 +++---- addons/foreign_legion/config.cpp | 1 + addons/foreign_legion/subconfig_ace/config.cpp | 5 +++-- addons/foreign_legion/subconfig_ace/script_component.hpp | 7 +++---- addons/foreign_legion/subconfig_cup/config.cpp | 5 +++-- addons/foreign_legion/subconfig_cup/script_component.hpp | 7 +++---- addons/main/script_macros.hpp | 4 ++++ addons/main/script_mod.hpp | 9 ++++++--- addons/police/config.cpp | 1 + addons/police/subconfig_cup/config.cpp | 5 +++-- addons/police/subconfig_cup/script_component.hpp | 7 +++---- addons/proxy_china/config.cpp | 1 + addons/proxy_china/subconfig_ace/config.cpp | 5 +++-- addons/proxy_china/subconfig_ace/script_component.hpp | 7 +++---- addons/proxy_russia/config.cpp | 1 + addons/proxy_russia/subconfig_ace/config.cpp | 5 +++-- addons/proxy_russia/subconfig_ace/script_component.hpp | 7 +++---- addons/revolutionaries/config.cpp | 1 + addons/sevenrings/config.cpp | 1 + addons/sevenrings/subconfig_ace/config.cpp | 5 +++-- addons/sevenrings/subconfig_ace/script_component.hpp | 7 +++---- addons/sevenrings/subconfig_cup/config.cpp | 5 +++-- addons/sevenrings/subconfig_cup/script_component.hpp | 7 +++---- addons/somali_pirates/config.cpp | 1 + addons/taliban/config.cpp | 1 + addons/taliban/subconfig_ace/config.cpp | 5 +++-- addons/taliban/subconfig_ace/script_component.hpp | 7 +++---- addons/taliban/subconfig_cup/config.cpp | 5 +++-- addons/taliban/subconfig_cup/script_component.hpp | 7 +++---- addons/vanguard/config.cpp | 1 + 62 files changed, 141 insertions(+), 119 deletions(-) delete mode 100644 addons/ammunition/subconfig_CUP/script_component.hpp rename addons/ammunition/{subconfig_CUP => subconfig_cup}/CfgAmmo.hpp (100%) rename addons/ammunition/{subconfig_CUP => subconfig_cup}/CfgMagazineWells.hpp (100%) rename addons/ammunition/{subconfig_CUP => subconfig_cup}/CfgMagazines.hpp (100%) rename addons/ammunition/{subconfig_CUP => subconfig_cup}/CfgWeapons.hpp (100%) rename addons/ammunition/{subconfig_CUP => subconfig_cup}/config.cpp (91%) create mode 100644 addons/ammunition/subconfig_cup/script_component.hpp diff --git a/addons/african_militia/config.cpp b/addons/african_militia/config.cpp index 47fc6d94..c08f7f2b 100644 --- a/addons/african_militia/config.cpp +++ b/addons/african_militia/config.cpp @@ -76,6 +76,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/african_militia/subconfig_ace/config.cpp b/addons/african_militia/subconfig_ace/config.cpp index 404afa74..a6388bd4 100644 --- a/addons/african_militia/subconfig_ace/config.cpp +++ b/addons/african_militia/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_African_Militia_B_Medic", @@ -15,10 +15,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/african_militia/subconfig_ace/script_component.hpp b/addons/african_militia/subconfig_ace/script_component.hpp index fb6f7561..c9e5bc59 100644 --- a/addons/african_militia/subconfig_ace/script_component.hpp +++ b/addons/african_militia/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT african_militia_ace -#define COMPONENT_BEAUTIFIED African Militia ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/african_militia/subconfig_cup/config.cpp b/addons/african_militia/subconfig_cup/config.cpp index f7de58cd..98b864e7 100644 --- a/addons/african_militia/subconfig_cup/config.cpp +++ b/addons/african_militia/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { // Backpacks @@ -20,10 +20,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/african_militia/subconfig_cup/script_component.hpp b/addons/african_militia/subconfig_cup/script_component.hpp index e593e592..9d292f26 100644 --- a/addons/african_militia/subconfig_cup/script_component.hpp +++ b/addons/african_militia/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT african_militia_cup -#define COMPONENT_BEAUTIFIED African Militia CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/african_north/config.cpp b/addons/african_north/config.cpp index ba555064..bdb610ce 100644 --- a/addons/african_north/config.cpp +++ b/addons/african_north/config.cpp @@ -161,6 +161,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/african_south/config.cpp b/addons/african_south/config.cpp index 5ec97b02..4364f1f1 100644 --- a/addons/african_south/config.cpp +++ b/addons/african_south/config.cpp @@ -200,6 +200,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/african_south/subconfig_ace/config.cpp b/addons/african_south/subconfig_ace/config.cpp index 87450fea..63c98ca7 100644 --- a/addons/african_south/subconfig_ace/config.cpp +++ b/addons/african_south/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_African_South_B_Medic", @@ -14,10 +14,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/african_south/subconfig_ace/script_component.hpp b/addons/african_south/subconfig_ace/script_component.hpp index 0b78aac2..c9e5bc59 100644 --- a/addons/african_south/subconfig_ace/script_component.hpp +++ b/addons/african_south/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT african_south_ace -#define COMPONENT_BEAUTIFIED African South ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/african_south/subconfig_cup/config.cpp b/addons/african_south/subconfig_cup/config.cpp index 1c8403ef..f219b2ec 100644 --- a/addons/african_south/subconfig_cup/config.cpp +++ b/addons/african_south/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_African_South_V_B_D30", @@ -18,10 +18,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/african_south/subconfig_cup/script_component.hpp b/addons/african_south/subconfig_cup/script_component.hpp index b97b6839..9d292f26 100644 --- a/addons/african_south/subconfig_cup/script_component.hpp +++ b/addons/african_south/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT african_south_cup -#define COMPONENT_BEAUTIFIED African South CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/ammunition/config.cpp b/addons/ammunition/config.cpp index cf7f8cae..1d5853b1 100644 --- a/addons/ammunition/config.cpp +++ b/addons/ammunition/config.cpp @@ -9,6 +9,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/ammunition/subconfig_CUP/script_component.hpp b/addons/ammunition/subconfig_CUP/script_component.hpp deleted file mode 100644 index 8bbb98a1..00000000 --- a/addons/ammunition/subconfig_CUP/script_component.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#define COMPONENT cup_ammunition -#define COMPONENT_BEAUTIFIED CUP Ammunition -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" -#include "..\script_macros.hpp" diff --git a/addons/ammunition/subconfig_CUP/CfgAmmo.hpp b/addons/ammunition/subconfig_cup/CfgAmmo.hpp similarity index 100% rename from addons/ammunition/subconfig_CUP/CfgAmmo.hpp rename to addons/ammunition/subconfig_cup/CfgAmmo.hpp diff --git a/addons/ammunition/subconfig_CUP/CfgMagazineWells.hpp b/addons/ammunition/subconfig_cup/CfgMagazineWells.hpp similarity index 100% rename from addons/ammunition/subconfig_CUP/CfgMagazineWells.hpp rename to addons/ammunition/subconfig_cup/CfgMagazineWells.hpp diff --git a/addons/ammunition/subconfig_CUP/CfgMagazines.hpp b/addons/ammunition/subconfig_cup/CfgMagazines.hpp similarity index 100% rename from addons/ammunition/subconfig_CUP/CfgMagazines.hpp rename to addons/ammunition/subconfig_cup/CfgMagazines.hpp diff --git a/addons/ammunition/subconfig_CUP/CfgWeapons.hpp b/addons/ammunition/subconfig_cup/CfgWeapons.hpp similarity index 100% rename from addons/ammunition/subconfig_CUP/CfgWeapons.hpp rename to addons/ammunition/subconfig_cup/CfgWeapons.hpp diff --git a/addons/ammunition/subconfig_CUP/config.cpp b/addons/ammunition/subconfig_cup/config.cpp similarity index 91% rename from addons/ammunition/subconfig_CUP/config.cpp rename to addons/ammunition/subconfig_cup/config.cpp index dfe20fb6..fe73a089 100644 --- a/addons/ammunition/subconfig_CUP/config.cpp +++ b/addons/ammunition/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = {}; weapons[] = {}; @@ -11,10 +11,11 @@ class CfgPatches { "tacu_ammunition", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/ammunition/subconfig_cup/script_component.hpp b/addons/ammunition/subconfig_cup/script_component.hpp new file mode 100644 index 00000000..9d292f26 --- /dev/null +++ b/addons/ammunition/subconfig_cup/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/assets/config.cpp b/addons/assets/config.cpp index 612ec58c..d7ca610c 100644 --- a/addons/assets/config.cpp +++ b/addons/assets/config.cpp @@ -158,6 +158,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main"}; author = ECSTRING(main,Author); authors[] = {"Mike, GilleeDoo"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/assets/subconfig_cup/config.cpp b/addons/assets/subconfig_cup/config.cpp index 52dff589..e1602d23 100644 --- a/addons/assets/subconfig_cup/config.cpp +++ b/addons/assets/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Assets_AGS_base", @@ -27,10 +27,11 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"tacu_assets", "CUP_Weapons_LoadOrder"}; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/assets/subconfig_cup/script_component.hpp b/addons/assets/subconfig_cup/script_component.hpp index 6c1a2e3c..9d292f26 100644 --- a/addons/assets/subconfig_cup/script_component.hpp +++ b/addons/assets/subconfig_cup/script_component.hpp @@ -1,5 +1,3 @@ -#define COMPONENT assets_cup -#define COMPONENT_BEAUTIFIED Assets CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" -#include "..\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/baf/config.cpp b/addons/baf/config.cpp index 74625aee..2f6c64db 100644 --- a/addons/baf/config.cpp +++ b/addons/baf/config.cpp @@ -118,6 +118,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"GilleeDoo, Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/baf/subconfig_ace/config.cpp b/addons/baf/subconfig_ace/config.cpp index de4d29f4..953b6039 100644 --- a/addons/baf/subconfig_ace/config.cpp +++ b/addons/baf/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_BAF_B_Demolitions_Fieldpack_Arid", @@ -18,10 +18,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/baf/subconfig_ace/script_component.hpp b/addons/baf/subconfig_ace/script_component.hpp index 6274380e..c9e5bc59 100644 --- a/addons/baf/subconfig_ace/script_component.hpp +++ b/addons/baf/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT baf_ace -#define COMPONENT_BEAUTIFIED British Armed Forces ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/baf/subconfig_cup/config.cpp b/addons/baf/subconfig_cup/config.cpp index 9be30482..5413a4f9 100644 --- a/addons/baf/subconfig_cup/config.cpp +++ b/addons/baf/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_BAF_V_B_Arid_L11A1", @@ -21,10 +21,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/baf/subconfig_cup/script_component.hpp b/addons/baf/subconfig_cup/script_component.hpp index 3d5c6701..9d292f26 100644 --- a/addons/baf/subconfig_cup/script_component.hpp +++ b/addons/baf/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT baf_cup -#define COMPONENT_BEAUTIFIED British Armed Forces CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/cartel_greek/config.cpp b/addons/cartel_greek/config.cpp index 25f59b97..59c0193c 100644 --- a/addons/cartel_greek/config.cpp +++ b/addons/cartel_greek/config.cpp @@ -61,6 +61,7 @@ class CfgPatches { }; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; skipWhenMissingDependencies = 1; }; diff --git a/addons/faction_overwrites/config.cpp b/addons/faction_overwrites/config.cpp index 124a58b5..2e233f1e 100644 --- a/addons/faction_overwrites/config.cpp +++ b/addons/faction_overwrites/config.cpp @@ -9,6 +9,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_ammunition"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/faction_overwrites/subconfig_cup/config.cpp b/addons/faction_overwrites/subconfig_cup/config.cpp index dae40516..286611b9 100644 --- a/addons/faction_overwrites/subconfig_cup/config.cpp +++ b/addons/faction_overwrites/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = {}; weapons[] = {}; @@ -11,10 +11,11 @@ class CfgPatches { "tacu_cup_ammunition", "CUP_Creatures_People_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/faction_overwrites/subconfig_cup/script_component.hpp b/addons/faction_overwrites/subconfig_cup/script_component.hpp index 1a1db792..9d292f26 100644 --- a/addons/faction_overwrites/subconfig_cup/script_component.hpp +++ b/addons/faction_overwrites/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT faction_overwrites_cup -#define COMPONENT_BEAUTIFIED Faction Overwrites CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/faction_overwrites/subconfig_mu/config.cpp b/addons/faction_overwrites/subconfig_mu/config.cpp index 6d5f3f6b..0eac516b 100644 --- a/addons/faction_overwrites/subconfig_mu/config.cpp +++ b/addons/faction_overwrites/subconfig_mu/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = {}; weapons[] = {}; @@ -16,10 +16,11 @@ class CfgPatches { "MU_mercs", "MU_RU" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/faction_overwrites/subconfig_mu/script_component.hpp b/addons/faction_overwrites/subconfig_mu/script_component.hpp index 14594791..06dd4e1d 100644 --- a/addons/faction_overwrites/subconfig_mu/script_component.hpp +++ b/addons/faction_overwrites/subconfig_mu/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT faction_overwrites_mu -#define COMPONENT_BEAUTIFIED Faction Overwrites Missing Units -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT mu +#define SUBCOMPONENT_BEAUTIFIED Missing Units +#include "..\script_component.hpp" diff --git a/addons/foreign_legion/config.cpp b/addons/foreign_legion/config.cpp index 6a3a5ae2..990921d3 100644 --- a/addons/foreign_legion/config.cpp +++ b/addons/foreign_legion/config.cpp @@ -94,6 +94,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/foreign_legion/subconfig_ace/config.cpp b/addons/foreign_legion/subconfig_ace/config.cpp index 9bb79f44..ea01dc79 100644 --- a/addons/foreign_legion/subconfig_ace/config.cpp +++ b/addons/foreign_legion/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Foreign_Legion_B_Demolitions_AssaultPack", @@ -15,10 +15,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/foreign_legion/subconfig_ace/script_component.hpp b/addons/foreign_legion/subconfig_ace/script_component.hpp index 63508e96..c9e5bc59 100644 --- a/addons/foreign_legion/subconfig_ace/script_component.hpp +++ b/addons/foreign_legion/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT foreign_legion_ace -#define COMPONENT_BEAUTIFIED Foreign Legion ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/foreign_legion/subconfig_cup/config.cpp b/addons/foreign_legion/subconfig_cup/config.cpp index 60c54a39..b9c58df6 100644 --- a/addons/foreign_legion/subconfig_cup/config.cpp +++ b/addons/foreign_legion/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Foreign_Legion_U_B_Rifleman", @@ -21,10 +21,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/foreign_legion/subconfig_cup/script_component.hpp b/addons/foreign_legion/subconfig_cup/script_component.hpp index 4629eedd..9d292f26 100644 --- a/addons/foreign_legion/subconfig_cup/script_component.hpp +++ b/addons/foreign_legion/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT foreign_legion_cup -#define COMPONENT_BEAUTIFIED Foreign Legion CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index b20c00fc..61ac0c43 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -3,6 +3,10 @@ #define TRIPLES(var1,var2,var3) var1##_##var2##_##var3 #define ADDON DOUBLES(PREFIX,COMPONENT) +#ifdef SUBCOMPONENT + #define SUBADDON DOUBLES(ADDON,SUBCOMPONENT) +#endif + // Main #define QUOTE(var1) #var1 #define VERSION_CONFIG version = MAJOR.MINOR; versionStr = QUOTE(MAJOR.MINOR.PATCH); versionAr[] = {MAJOR,MINOR,PATCH} diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index aa56adf2..3321f915 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -9,8 +9,11 @@ // MINIMAL required version for the Mod. Components can specify others.. #define REQUIRED_VERSION 1.94 -#ifdef COMPONENT_BEAUTIFIED - #define COMPONENT_NAME QUOTE(Theseus Units - COMPONENT_BEAUTIFIED) +#ifndef COMPONENT_BEAUTIFIED + #define COMPONENT_BEAUTIFIED COMPONENT +#endif +#ifdef SUBCOMPONENT_BEAUTIFIED + #define COMPONENT_NAME QUOTE(Theseus Units - COMPONENT_BEAUTIFIED - SUBCOMPONENT_BEAUTIFIED) #else - #define COMPONENT_NAME QUOTE(Theseus Units - COMPONENT) + #define COMPONENT_NAME QUOTE(Theseus Units - COMPONENT_BEAUTIFIED) #endif diff --git a/addons/police/config.cpp b/addons/police/config.cpp index 55e8ab5d..968f0aed 100644 --- a/addons/police/config.cpp +++ b/addons/police/config.cpp @@ -52,6 +52,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets",}; author = ECSTRING(main,Author); authors[] = {"Kresky", "Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/police/subconfig_cup/config.cpp b/addons/police/subconfig_cup/config.cpp index ecac2cef..49f4e505 100644 --- a/addons/police/subconfig_cup/config.cpp +++ b/addons/police/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Police_U_B_CT_Breacher", @@ -30,10 +30,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/police/subconfig_cup/script_component.hpp b/addons/police/subconfig_cup/script_component.hpp index 2fe05ea5..9d292f26 100644 --- a/addons/police/subconfig_cup/script_component.hpp +++ b/addons/police/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT police_cup -#define COMPONENT_BEAUTIFIED Police CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/proxy_china/config.cpp b/addons/proxy_china/config.cpp index 9500a26c..2739ffa9 100644 --- a/addons/proxy_china/config.cpp +++ b/addons/proxy_china/config.cpp @@ -107,6 +107,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/proxy_china/subconfig_ace/config.cpp b/addons/proxy_china/subconfig_ace/config.cpp index 06f5298e..90d9ecc3 100644 --- a/addons/proxy_china/subconfig_ace/config.cpp +++ b/addons/proxy_china/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Proxy_China_B_Demolitions", @@ -15,10 +15,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/proxy_china/subconfig_ace/script_component.hpp b/addons/proxy_china/subconfig_ace/script_component.hpp index b1b681a6..c9e5bc59 100644 --- a/addons/proxy_china/subconfig_ace/script_component.hpp +++ b/addons/proxy_china/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT proxy_china_ace -#define COMPONENT_BEAUTIFIED Proxy China ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/proxy_russia/config.cpp b/addons/proxy_russia/config.cpp index fa0d15a7..a31f203e 100644 --- a/addons/proxy_russia/config.cpp +++ b/addons/proxy_russia/config.cpp @@ -180,6 +180,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/proxy_russia/subconfig_ace/config.cpp b/addons/proxy_russia/subconfig_ace/config.cpp index 8183b993..7b265da3 100644 --- a/addons/proxy_russia/subconfig_ace/config.cpp +++ b/addons/proxy_russia/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Proxy_Russia_B_Demolitions", @@ -15,10 +15,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/proxy_russia/subconfig_ace/script_component.hpp b/addons/proxy_russia/subconfig_ace/script_component.hpp index 08f79c50..c9e5bc59 100644 --- a/addons/proxy_russia/subconfig_ace/script_component.hpp +++ b/addons/proxy_russia/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT proxy_russia_ace -#define COMPONENT_BEAUTIFIED Proxy Russia ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/revolutionaries/config.cpp b/addons/revolutionaries/config.cpp index 201290f0..f1972e8b 100644 --- a/addons/revolutionaries/config.cpp +++ b/addons/revolutionaries/config.cpp @@ -100,6 +100,7 @@ class CfgPatches { }; author = ECSTRING(main,Author); authors[] = {"Jack"}; + url = ECSTRING(main,URL); VERSION_CONFIG; skipWhenMissingDependencies = 1; }; diff --git a/addons/sevenrings/config.cpp b/addons/sevenrings/config.cpp index 00ee8a59..842db43e 100644 --- a/addons/sevenrings/config.cpp +++ b/addons/sevenrings/config.cpp @@ -126,6 +126,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/sevenrings/subconfig_ace/config.cpp b/addons/sevenrings/subconfig_ace/config.cpp index c7c480f8..b6086188 100644 --- a/addons/sevenrings/subconfig_ace/config.cpp +++ b/addons/sevenrings/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Seven_Rings_Eastern_B_Demo", @@ -18,10 +18,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/sevenrings/subconfig_ace/script_component.hpp b/addons/sevenrings/subconfig_ace/script_component.hpp index 477429b3..c9e5bc59 100644 --- a/addons/sevenrings/subconfig_ace/script_component.hpp +++ b/addons/sevenrings/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT seven_rings_ace -#define COMPONENT_BEAUTIFIED Seven Rings ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/sevenrings/subconfig_cup/config.cpp b/addons/sevenrings/subconfig_cup/config.cpp index a97e5c4d..6a2bb50c 100644 --- a/addons/sevenrings/subconfig_cup/config.cpp +++ b/addons/sevenrings/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Seven_Rings_V_I_Metis", @@ -22,10 +22,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/sevenrings/subconfig_cup/script_component.hpp b/addons/sevenrings/subconfig_cup/script_component.hpp index de11f239..9d292f26 100644 --- a/addons/sevenrings/subconfig_cup/script_component.hpp +++ b/addons/sevenrings/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT seven_rings_cup -#define COMPONENT_BEAUTIFIED Seven Rings CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/somali_pirates/config.cpp b/addons/somali_pirates/config.cpp index 616ac059..2f211f23 100644 --- a/addons/somali_pirates/config.cpp +++ b/addons/somali_pirates/config.cpp @@ -41,6 +41,7 @@ class CfgPatches { }; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; skipWhenMissingDependencies = 1; }; diff --git a/addons/taliban/config.cpp b/addons/taliban/config.cpp index 361ed71d..ccf89027 100644 --- a/addons/taliban/config.cpp +++ b/addons/taliban/config.cpp @@ -117,6 +117,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/taliban/subconfig_ace/config.cpp b/addons/taliban/subconfig_ace/config.cpp index f780d96b..7c222c43 100644 --- a/addons/taliban/subconfig_ace/config.cpp +++ b/addons/taliban/subconfig_ace/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { "TACU_Taliban_Militia_B_Medic", @@ -14,10 +14,11 @@ class CfgPatches { "ace_explosives", "ace_medical_treatment" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/taliban/subconfig_ace/script_component.hpp b/addons/taliban/subconfig_ace/script_component.hpp index 7cd6c42a..c9e5bc59 100644 --- a/addons/taliban/subconfig_ace/script_component.hpp +++ b/addons/taliban/subconfig_ace/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT taliban_ace -#define COMPONENT_BEAUTIFIED Taliban ACE -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT ace +#define SUBCOMPONENT_BEAUTIFIED ACE +#include "..\script_component.hpp" diff --git a/addons/taliban/subconfig_cup/config.cpp b/addons/taliban/subconfig_cup/config.cpp index 59184162..ae1a9767 100644 --- a/addons/taliban/subconfig_cup/config.cpp +++ b/addons/taliban/subconfig_cup/config.cpp @@ -1,7 +1,7 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { + class SUBADDON { name = COMPONENT_NAME; units[] = { // Backpacks @@ -48,10 +48,11 @@ class CfgPatches { "tacu_assets_cup", "CUP_Weapons_LoadOrder" }; + skipWhenMissingDependencies = 1; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; - skipWhenMissingDependencies = 1; }; }; diff --git a/addons/taliban/subconfig_cup/script_component.hpp b/addons/taliban/subconfig_cup/script_component.hpp index 7ff11f2c..9d292f26 100644 --- a/addons/taliban/subconfig_cup/script_component.hpp +++ b/addons/taliban/subconfig_cup/script_component.hpp @@ -1,4 +1,3 @@ -#define COMPONENT taliban_cup -#define COMPONENT_BEAUTIFIED Taliban CUP -#include "\x\tacu\addons\main\script_mod.hpp" -#include "\x\tacu\addons\main\script_macros.hpp" +#define SUBCOMPONENT cup +#define SUBCOMPONENT_BEAUTIFIED CUP +#include "..\script_component.hpp" diff --git a/addons/vanguard/config.cpp b/addons/vanguard/config.cpp index 04bbc464..dc2e6217 100644 --- a/addons/vanguard/config.cpp +++ b/addons/vanguard/config.cpp @@ -183,6 +183,7 @@ class CfgPatches { requiredAddons[] = {"tacu_main", "tacu_assets"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; + url = ECSTRING(main,URL); VERSION_CONFIG; }; };