Move compatibilities to main mod and conditionally load (#1270)

Co-authored-by: jonpas <[email protected]>
IDI-Systems · Sep 6, 2023 · 1b87a44 · 1b87a44
1 parent 4614ef0
commit 1b87a44
Show file tree

Hide file tree

Showing 37 changed files with 38 additions and 46 deletions.
diff --git a/addons/compat_csla/$PBOPREFIX$ b/addons/compat_csla/$PBOPREFIX$
@@ -0,0 +1 @@
+idi\acre\addons\compat_csla
diff --git a/optionals/sys_csla/LICENSE → addons/compat_csla/LICENSE b/optionals/sys_csla/LICENSE → addons/compat_csla/LICENSE
diff --git a/optionals/sys_csla/README.md → addons/compat_csla/README.md b/optionals/sys_csla/README.md → addons/compat_csla/README.md
@@ -1,4 +1,4 @@
-sys_csla
+compat_csla
 ===
 
 Compatibility with Arma 3 Creator DLC: [CSLA Iron Curtain](https://store.steampowered.com/app/1294440/Arma_3_Creator_DLC_CSLA_Iron_Curtain/).
diff --git a/optionals/sys_csla/config.cpp → addons/compat_csla/config.cpp b/optionals/sys_csla/config.cpp → addons/compat_csla/config.cpp
@@ -6,7 +6,8 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"acre_main"};
+        requiredAddons[] = {"acre_main", "CSLA"};
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"CSLA Studio"};
         url = ECSTRING(main,URL);
@@ -16,6 +17,6 @@ class CfgPatches {
 
 class CfgAcreWorlds {
     class stozec {
-        wrp = "\idi\acre\addons\sys_csla\stozec.fakewrp";
+        wrp = QPATHTOF(stozec.fakewrp);
     };
 };
diff --git a/optionals/sys_csla/script_component.hpp → addons/compat_csla/script_component.hpp b/optionals/sys_csla/script_component.hpp → addons/compat_csla/script_component.hpp
@@ -1,13 +1,13 @@
-#define COMPONENT sys_csla
+#define COMPONENT compat_csla
 #define COMPONENT_BEAUTIFIED CSLA Iron Curtain Compatibility
 #include "\idi\acre\addons\main\script_mod.hpp"
 
-#ifdef DEBUG_ENABLED_SYS_CSLA
+#ifdef DEBUG_ENABLED_COMPAT_CSLA
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_ENABLED_SYS_CSLA
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_SYS_CSLA
+#ifdef DEBUG_ENABLED_COMPAT_CSLA
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_COMPAT_CSLA
 #endif
 
 #include "\idi\acre\addons\main\script_macros.hpp"
diff --git a/optionals/sys_csla/stozec.fakewrp → addons/compat_csla/stozec.fakewrp b/optionals/sys_csla/stozec.fakewrp → addons/compat_csla/stozec.fakewrp
diff --git a/addons/compat_gm/$PBOPREFIX$ b/addons/compat_gm/$PBOPREFIX$
@@ -0,0 +1 @@
+idi\acre\addons\compat_gm
diff --git a/optionals/sys_gm/LICENSE → addons/compat_gm/LICENSE b/optionals/sys_gm/LICENSE → addons/compat_gm/LICENSE
diff --git a/optionals/sys_gm/README.md → addons/compat_gm/README.md b/optionals/sys_gm/README.md → addons/compat_gm/README.md
@@ -1,4 +1,4 @@
-sys_gm
+compat_gm
 ===
 
 Compatibility with Arma 3 Creator DLC: [Global Mobilization - Cold War Germany](http://www.global-mobilization.com/).