XEH cleanup for 2.14

CBATeam · Aug 30, 2023 · 4e39870 · 4e39870
1 parent 0a28b08
commit 4e39870
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 53 deletions.
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -10,7 +10,7 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.06
+#define REQUIRED_VERSION 2.14
 
 /*
 // Defined DEBUG_MODE_NORMAL in a few CBA_fncs to prevent looped logging :)

diff --git a/addons/xeh/addon.toml b/addons/xeh/addon.toml
diff --git a/addons/xeh/compat_contact/config.cpp b/addons/xeh/compat_contact/config.cpp
@@ -2,14 +2,6 @@
 #undef COMPONENT
 #define COMPONENT xeh_compat_contact
 
-#if __has_include("\a3\Data_F_Contact\config.bin")
-#else
-#define PATCH_SKIP "Contact DLC"
-#endif
-
-#ifdef PATCH_SKIP
-CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         units[] = {};
@@ -66,5 +58,3 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 };
-
-#endif
diff --git a/addons/xeh/compat_csla/config.cpp b/addons/xeh/compat_csla/config.cpp
@@ -2,14 +2,6 @@
 #undef COMPONENT
 #define COMPONENT xeh_compat_csla
 
-#if __has_include("\csla_cfg\config.bin")
-#else
-#define PATCH_SKIP "CSLA - Iron Curtain"
-#endif
-
-#ifdef PATCH_SKIP
-CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         units[] = {};
@@ -61,5 +53,3 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 };
-
-#endif
diff --git a/addons/xeh/compat_sog/config.cpp b/addons/xeh/compat_sog/config.cpp
@@ -2,14 +2,6 @@
 #undef COMPONENT
 #define COMPONENT xeh_compat_sog
 
-#if __has_include("\vn\weapons_f_vietnam\config.bin")
-#else
-#define PATCH_SKIP "SOG-Vietnam"
-#endif
-
-#ifdef PATCH_SKIP
-CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         units[] = {};
@@ -53,5 +45,3 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 };
-
-#endif
diff --git a/addons/xeh/compat_ws/config.cpp b/addons/xeh/compat_ws/config.cpp
@@ -2,14 +2,6 @@
 #undef COMPONENT
 #define COMPONENT xeh_compat_ws
 
-#if __has_include("\lxWS\data_f_lxWS\config.bin")
-#else
-#define PATCH_SKIP "Western Sahara"
-#endif
-
-#ifdef PATCH_SKIP
-CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         units[] = {};
@@ -85,5 +77,3 @@ class CfgVehicles {
         XEH_ENABLED;
     };
 };
-
-#endif
diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
@@ -38,16 +38,6 @@
 
 #include "script_xeh.hpp"
 
-// macro add a dummy cfgPatch - this macro may be removed after 2.14 cleanup!
-#define CBA_XEH_PATCH_NOT_LOADED(NAME,CAUSE) \
-class CfgPatches { \
-    class DOUBLES(NAME,notLoaded) { \
-        units[] = {}; \
-        weapons[] = {}; \
-        cba_not_loaded = CAUSE; \
-    }; \
-};
-
 #undef XEH_ENABLED
 #define XEH_ENABLED class EventHandlers {class XEH_CLASS: XEH_CLASS_BASE {};}; SLX_XEH_DISABLED = 0