From 75d97866f0a4899316d96e17ceeb183b3102229e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 13 Oct 2025 18:55:33 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"Revert=20"Medical/Realistic=20Nam?= =?UTF-8?q?es=20-=20use=20`skipWhenAnyAddonPresent`"=20(#11=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 45338151df4c03b6d5825ff4f7dbd8397a36b245. --- addons/main/script_mod.hpp | 2 +- addons/medical_engine/config.cpp | 11 +---------- addons/realisticnames/config.cpp | 11 +---------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index b1f3e932210..4d95004a05a 100644 --- 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.20 +#define REQUIRED_VERSION 2.22 #define REQUIRED_CBA_VERSION {3,18,4} #ifndef COMPONENT_BEAUTIFIED diff --git a/addons/medical_engine/config.cpp b/addons/medical_engine/config.cpp index 21e779c7308..1c35150899b 100644 --- a/addons/medical_engine/config.cpp +++ b/addons/medical_engine/config.cpp @@ -1,13 +1,5 @@ #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; @@ -15,6 +7,7 @@ class CfgPatches { 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 diff --git a/addons/realisticnames/config.cpp b/addons/realisticnames/config.cpp index 8cf62329065..be173f9b649 100644 --- a/addons/realisticnames/config.cpp +++ b/addons/realisticnames/config.cpp @@ -1,13 +1,5 @@ #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; @@ -15,6 +7,7 @@ class CfgPatches { 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 From d90ca6c6a4b4b6fa8434895f478ca4bd34d7ca0a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 12 Feb 2026 10:43:45 -0600 Subject: [PATCH 2/2] delete addon.toml s --- addons/medical_engine/addon.toml | 3 --- addons/realisticnames/addon.toml | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 addons/medical_engine/addon.toml delete mode 100644 addons/realisticnames/addon.toml diff --git a/addons/medical_engine/addon.toml b/addons/medical_engine/addon.toml deleted file mode 100644 index bf39213892e..00000000000 --- a/addons/medical_engine/addon.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tools] -pboProject_noBinConfig = true -sqfvm_skipConfigChecks = true diff --git a/addons/realisticnames/addon.toml b/addons/realisticnames/addon.toml deleted file mode 100644 index bf39213892e..00000000000 --- a/addons/realisticnames/addon.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tools] -pboProject_noBinConfig = true -sqfvm_skipConfigChecks = true