diff --git a/addons/compat_csla/addon.toml b/addons/compat_csla/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_csla/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp b/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp index 635e6f253a..b29f7e717d 100644 --- a/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp +++ b/addons/compat_csla/compat_csla_explosives/CfgMagazines.hpp @@ -1,14 +1,15 @@ class CfgMagazines { + class US85_Magazine; class US85_ATMine_mag: US85_Magazine { - EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_ATMine_mag"; + EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_ATMine_mag"; useAction = 0; }; class US85_M14Mine_mag: US85_Magazine { - EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_M14Mine"; + EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_M14Mine"; useAction = 0; }; class US85_SatchelCharge_Mag: US85_Magazine { - EGVAR(explosive,SetupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag"; + EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_US85_SatchelCharge_Mag"; useAction = 0; }; }; diff --git a/addons/compat_csla/compat_csla_explosives/config.cpp b/addons/compat_csla/compat_csla_explosives/config.cpp index 934d6787f4..d85e9f34a8 100644 --- a/addons/compat_csla/compat_csla_explosives/config.cpp +++ b/addons/compat_csla/compat_csla_explosives/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\csla_cfg\config.bin") -#else -#define PATCH_SKIP "CSLA - Iron Curtain" -#endif - -#if __has_include("\z\ace\addons\explosives\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Explosives" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -23,7 +7,7 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_explosives", "CSLA", "US85"}; - skipWhenMissingDependencies = 1; // drop __has_include and addon.toml after 2.14 + skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"Dahlgren"}; url = ECSTRING(main,URL); @@ -33,5 +17,3 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_csla/config.cpp b/addons/compat_csla/config.cpp index 0cf6c52f68..d0f99c092c 100644 --- a/addons/compat_csla/config.cpp +++ b/addons/compat_csla/config.cpp @@ -1,22 +1,13 @@ #include "script_component.hpp" -#if __has_include("\csla_cfg\config.bin") -#else -#define PATCH_SKIP "CSLA - Iron Curtain" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"CSLA", "US85"}; - skipWhenMissingDependencies = 1; // drop __has_include and addon.toml after 2.14 + requiredAddons[] = {"ace_common", "CSLA", "US85"}; + skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"Dahlgren"}; url = ECSTRING(main,URL); @@ -26,5 +17,3 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/addon.toml b/addons/compat_rhs_afrf3/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_rhs_afrf3/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp index 5a754caa81..71ddf3b478 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_csw/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\csw\script_component.hpp") - #include "\z\ace\addons\csw\script_config_macros_csw.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Crew Served Weapons" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else +// 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 { @@ -39,5 +25,3 @@ class CfgPatches { #include "CfgMagazineGroups.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp index 814596b7b3..9e767987da 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\explosives\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Explosives" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -37,4 +21,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgVehicles.hpp" -#endif diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp index acd494573a..d47b787f32 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_fastroping/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\fastroping\script_component.hpp") +// Config will be binerized, so this include is only required at build-time #include "\z\ace\addons\fastroping\script_macros.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Fastroping" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else class CfgPatches { class ADDON { @@ -35,5 +21,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp index 336fadd75d..3950c7890e 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_nightvision/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\nightvision\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Night Vision" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -35,5 +19,3 @@ class CfgPatches { }; #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp index 65f957c22b..328d049bea 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_refuel/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\refuel\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Refuel" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -35,5 +19,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp index d3581d38be..ce2272766d 100644 --- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp +++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_scopes/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#if __has_include("\z\ace\addons\scopes\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Scopes" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -35,5 +19,3 @@ class CfgPatches { }; #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_afrf3/config.cpp b/addons/compat_rhs_afrf3/config.cpp index f9fbba134a..3497a8e956 100644 --- a/addons/compat_rhs_afrf3/config.cpp +++ b/addons/compat_rhs_afrf3/config.cpp @@ -1,14 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS AFRF" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -29,5 +20,3 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_gref3/addon.toml b/addons/compat_rhs_gref3/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_rhs_gref3/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp index 839da56db6..975dd19825 100644 --- a/addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp +++ b/addons/compat_rhs_gref3/compat_rhs_gref3_csw/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS GREF" -#endif - -#if __has_include("\z\ace\addons\csw\script_component.hpp") - #include "\z\ace\addons\csw\script_config_macros_csw.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Crew Served Weapons" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else +// 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 { @@ -36,5 +22,3 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp index cb24a2af47..5c646c42b4 100644 --- a/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp +++ b/addons/compat_rhs_gref3/compat_rhs_gref3_explosives/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS GREF" -#endif - -#if __has_include("\z\ace\addons\explosives\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Explosives" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -36,5 +20,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp b/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp index 166433bad9..19c4d2f612 100644 --- a/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp +++ b/addons/compat_rhs_gref3/compat_rhs_gref3_fastroping/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS GREF" -#endif - -#if __has_include("\z\ace\addons\fastroping\script_component.hpp") +// Config will be binerized, so this include is only required at build-time #include "\z\ace\addons\fastroping\script_macros.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Fastroping" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else class CfgPatches { class ADDON { @@ -35,5 +21,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_gref3/config.cpp b/addons/compat_rhs_gref3/config.cpp index f78c30c334..f2e7aeacde 100644 --- a/addons/compat_rhs_gref3/config.cpp +++ b/addons/compat_rhs_gref3/config.cpp @@ -1,14 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsgref\addons\rhsgref_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS GREF" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -29,5 +20,3 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_saf3/addon.toml b/addons/compat_rhs_saf3/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_rhs_saf3/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp index b9d67541b6..45d4945c5a 100644 --- a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp +++ b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhssaf\addons\rhssaf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS SAF" -#endif - -#if __has_include("\z\ace\addons\explosives\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Explosives" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = QUOTE(COMPONENT); @@ -36,5 +20,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" - -#endif diff --git a/addons/compat_rhs_saf3/config.cpp b/addons/compat_rhs_saf3/config.cpp index cc5643b700..e6b708dcbb 100644 --- a/addons/compat_rhs_saf3/config.cpp +++ b/addons/compat_rhs_saf3/config.cpp @@ -1,14 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhssaf\addons\rhssaf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS SAF" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -26,5 +17,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/addon.toml b/addons/compat_rhs_usf3/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_rhs_usf3/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/config.cpp index 780167309a..9bd4ef913a 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_csw/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_csw/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\csw\script_component.hpp") - #include "\z\ace\addons\csw\script_config_macros_csw.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Crew Served Weapons" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else +// 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 { @@ -36,5 +22,3 @@ class CfgPatches { #include "CfgMagazineGroups.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/config.cpp index 5f917a723e..3ac788a89d 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\explosives\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Explosives" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { addonRootClass = QUOTE(COMPONENT); @@ -34,5 +18,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgMagazines.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/config.cpp index 2c690c85a1..345f70a1e7 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_fastroping/config.cpp @@ -1,21 +1,7 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\fastroping\script_component.hpp") +// Config will be binerized, so this include is only required at build-time #include "\z\ace\addons\fastroping\script_macros.hpp" -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Fastroping" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else class CfgPatches { class ADDON { @@ -35,5 +21,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/config.cpp index 3430e08420..c5c581c01f 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_javelin/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\javelin\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Javelin" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { addonRootClass = QUOTE(COMPONENT); @@ -33,5 +17,3 @@ class CfgPatches { #include "CfgAmmo.hpp" #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/config.cpp index 41e55588c6..dcbdc49509 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_nightvision/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\nightvision\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Night Vision" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { addonRootClass = QUOTE(COMPONENT); @@ -32,5 +16,3 @@ class CfgPatches { }; #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp index d415ba9c0d..b336b89cc6 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\refuel\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Refuel" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { addonRootClass = QUOTE(COMPONENT); @@ -33,5 +17,3 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_scopes/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_scopes/config.cpp index bba2de52ae..7c7a65b79e 100644 --- a/addons/compat_rhs_usf3/compat_rhs_usf3_scopes/config.cpp +++ b/addons/compat_rhs_usf3/compat_rhs_usf3_scopes/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#if __has_include("\z\ace\addons\scopes\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Scopes" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { addonRootClass = QUOTE(COMPONENT); @@ -32,5 +16,3 @@ class CfgPatches { }; #include "CfgWeapons.hpp" - -#endif diff --git a/addons/compat_rhs_usf3/config.cpp b/addons/compat_rhs_usf3/config.cpp index 8879b743e3..bdfc2e1d51 100644 --- a/addons/compat_rhs_usf3/config.cpp +++ b/addons/compat_rhs_usf3/config.cpp @@ -1,14 +1,5 @@ #include "script_component.hpp" -#if __has_include("\rhsusf\addons\rhsusf_main\loadorder\config.bin") -#else - #define PATCH_SKIP "RHS USAF" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -31,5 +22,3 @@ class CfgPatches { #include "CfgWeapons.hpp" #include "CfgVehicles.hpp" #include "CfgGlasses.hpp" - -#endif diff --git a/addons/compat_sog/addon.toml b/addons/compat_sog/addon.toml deleted file mode 100644 index 7cfef775ee..0000000000 --- a/addons/compat_sog/addon.toml +++ /dev/null @@ -1,2 +0,0 @@ -[preprocess] -enabled = false diff --git a/addons/compat_sog/compat_sog_trenches/config.cpp b/addons/compat_sog/compat_sog_trenches/config.cpp index e40d39a0be..9559ddf189 100644 --- a/addons/compat_sog/compat_sog_trenches/config.cpp +++ b/addons/compat_sog/compat_sog_trenches/config.cpp @@ -1,21 +1,5 @@ #include "script_component.hpp" -#if __has_include("\vn\weapons_f_vietnam\config.bin") -#else - #define PATCH_SKIP "SOG-Vietnam" -#endif - -#if __has_include("\z\ace\addons\csw\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Trenches" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -34,5 +18,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_sog/compat_sog_trenches_grad/config.cpp b/addons/compat_sog/compat_sog_trenches_grad/config.cpp index 0dc5621b8d..8a25324454 100644 --- a/addons/compat_sog/compat_sog_trenches_grad/config.cpp +++ b/addons/compat_sog/compat_sog_trenches_grad/config.cpp @@ -1,28 +1,5 @@ #include "script_component.hpp" -#if __has_include("\vn\weapons_f_vietnam\config.bin") -#else - #define PATCH_SKIP "SOG-Vietnam" -#endif - -#if __has_include("\z\ace\addons\csw\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "ACE Trenches" - #endif -#endif - -#if __has_include("\x\grad_trenches\addons\main\script_component.hpp") -#else - #ifndef PATCH_SKIP - #define PATCH_SKIP "Grad Trenches" - #endif -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -41,5 +18,3 @@ class CfgPatches { }; #include "CfgVehicles.hpp" - -#endif diff --git a/addons/compat_sog/config.cpp b/addons/compat_sog/config.cpp index dac72a7dee..8a6ed30148 100644 --- a/addons/compat_sog/config.cpp +++ b/addons/compat_sog/config.cpp @@ -1,14 +1,5 @@ #include "script_component.hpp" -#if __has_include("\vn\weapons_f_vietnam\config.bin") -#else - #define PATCH_SKIP "SOG-Vietnam" -#endif - -#ifdef PATCH_SKIP -ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) -#else - class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -44,9 +35,7 @@ class CfgPatches { QGVAR(mortar_type53_carry) }; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = { - "loadorder_f_vietnam" - }; + requiredAddons[] = {"ace_common", "loadorder_f_vietnam"}; skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"BaerMitUmlaut", "veteran29"}; @@ -65,5 +54,3 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" #include "EMM_mainMenu_CfgMenus.hpp" - -#endif