cleanup EE folder and move everything to XEH

CBATeam · Aug 30, 2023 · 0a28b08 · 0a28b08
1 parent 92bf768
commit 0a28b08
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 26 deletions.
diff --git a/addons/ee/$PBOPREFIX$ b/addons/ee/$PBOPREFIX$
diff --git a/addons/ee/script_component.hpp b/addons/ee/script_component.hpp
diff --git a/addons/ee/addon.toml → addons/xeh/addon.toml b/addons/ee/addon.toml → addons/xeh/addon.toml
diff --git a/addons/ee/compat_contact/config.cpp → addons/xeh/compat_contact/config.cpp b/addons/ee/compat_contact/config.cpp → addons/xeh/compat_contact/config.cpp
@@ -1,14 +1,14 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_contact
+#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_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {

diff --git a/addons/ee/compat_csla/config.cpp → addons/xeh/compat_csla/config.cpp b/addons/ee/compat_csla/config.cpp → addons/xeh/compat_csla/config.cpp
@@ -1,14 +1,14 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_csla
+#define COMPONENT xeh_compat_csla
 
 #if __has_include("\csla_cfg\config.bin")
 #else
 #define PATCH_SKIP "CSLA - Iron Curtain"
 #endif
 
 #ifdef PATCH_SKIP
-CBA_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {

diff --git a/addons/ee/compat_sog/config.cpp → addons/xeh/compat_sog/config.cpp b/addons/ee/compat_sog/config.cpp → addons/xeh/compat_sog/config.cpp
@@ -1,14 +1,14 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_sog
+#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_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {

diff --git a/addons/ee/compat_ws/config.cpp → addons/xeh/compat_ws/config.cpp b/addons/ee/compat_ws/config.cpp → addons/xeh/compat_ws/config.cpp
@@ -1,14 +1,14 @@
-#include "\x\cba\addons\ee\script_component.hpp"
+#include "\x\cba\addons\xeh\script_component.hpp"
 #undef COMPONENT
-#define COMPONENT ee_compat_ws
+#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_EE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
+CBA_XEH_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
 #else
 class CfgPatches {
     class ADDON {

diff --git a/addons/ee/config.cpp → addons/xeh/ee/config.cpp b/addons/ee/config.cpp → addons/xeh/ee/config.cpp
@@ -1,5 +1,3 @@
-#include "script_component.hpp"
-
 class CfgPatches {
     class cba_ee {
         requiredAddons[] = {"cba_xeh"};

diff --git a/addons/xeh/script_component.hpp b/addons/xeh/script_component.hpp
@@ -38,6 +38,16 @@
 
 #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