Medical/Realistic Names - use skipWhenAnyAddonPresent (acemod#11081)

Author: PabstMirror

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.20
+#define REQUIRED_VERSION 2.22
 #define REQUIRED_CBA_VERSION {3,18,4}
 
 #ifndef COMPONENT_BEAUTIFIED

addons/medical_engine/config.cpp

@@ -1,20 +1,13 @@
 #include "script_component.hpp"
 
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
-#define PATCH_SKIP "No Medical"
-#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[] = {"ace_common"};
+        skipWhenAnyAddonPresent[] = {"ace_nomedical"}; // requires 2.22
         author = ECSTRING(common,ACETeam);
         authors[] = {"Glowbal","KoffeinFlummi","commy2"};
         url = ECSTRING(main,URL);
@@ -28,5 +21,3 @@ class CfgPatches {
 #include "CfgFunctions.hpp"
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
-
-#endif

addons/realisticnames/config.cpp

@@ -1,20 +1,13 @@
 #include "script_component.hpp"
 
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\z\ace\addons\norealisticnames\script_component.hpp")
-#define PATCH_SKIP "No Realistic Names"
-#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[] = {"ace_common", "ace_optics"};
+        skipWhenAnyAddonPresent[] = {"ace_norealisticnames"}; // requires 2.22
         author = ECSTRING(common,ACETeam);
         authors[] = {"KoffeinFlummi","TaoSensai","commy2"};
         url = ECSTRING(main,URL);
@@ -28,5 +21,3 @@ class CfgPatches {
 #include "CfgMagazines.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
-
-#endif