Skip to content

Commit 4533815

Browse files
authored
Revert "Medical/Realistic Names - use skipWhenAnyAddonPresent" (acemod#11096)
Revert "Medical/Realistic Names - use `skipWhenAnyAddonPresent` (acemod#11081)" This reverts commit 1635e1e.
1 parent 1635e1e commit 4533815

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

addons/main/script_mod.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
1111

1212
// MINIMAL required version for the Mod. Components can specify others..
13-
#define REQUIRED_VERSION 2.22
13+
#define REQUIRED_VERSION 2.20
1414
#define REQUIRED_CBA_VERSION {3,18,4}
1515

1616
#ifndef COMPONENT_BEAUTIFIED

addons/medical_engine/config.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
#include "script_component.hpp"
22

3+
#pragma hemtt flag pe23_ignore_has_include
4+
#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
5+
#define PATCH_SKIP "No Medical"
6+
#endif
7+
8+
#ifdef PATCH_SKIP
9+
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
10+
#else
311
class CfgPatches {
412
class ADDON {
513
name = COMPONENT_NAME;
614
units[] = {};
715
weapons[] = {};
816
requiredVersion = REQUIRED_VERSION;
917
requiredAddons[] = {"ace_common"};
10-
skipWhenAnyAddonPresent[] = {"ace_nomedical"}; // requires 2.22
1118
author = ECSTRING(common,ACETeam);
1219
authors[] = {"Glowbal","KoffeinFlummi","commy2"};
1320
url = ECSTRING(main,URL);
@@ -21,3 +28,5 @@ class CfgPatches {
2128
#include "CfgFunctions.hpp"
2229
#include "CfgMoves.hpp"
2330
#include "CfgVehicles.hpp"
31+
32+
#endif

addons/realisticnames/config.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
#include "script_component.hpp"
22

3+
#pragma hemtt flag pe23_ignore_has_include
4+
#if __has_include("\z\ace\addons\norealisticnames\script_component.hpp")
5+
#define PATCH_SKIP "No Realistic Names"
6+
#endif
7+
8+
#ifdef PATCH_SKIP
9+
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
10+
#else
311
class CfgPatches {
412
class ADDON {
513
name = COMPONENT_NAME;
614
units[] = {};
715
weapons[] = {};
816
requiredVersion = REQUIRED_VERSION;
917
requiredAddons[] = {"ace_common", "ace_optics"};
10-
skipWhenAnyAddonPresent[] = {"ace_norealisticnames"}; // requires 2.22
1118
author = ECSTRING(common,ACETeam);
1219
authors[] = {"KoffeinFlummi","TaoSensai","commy2"};
1320
url = ECSTRING(main,URL);
@@ -21,3 +28,5 @@ class CfgPatches {
2128
#include "CfgMagazines.hpp"
2229
#include "CfgVehicles.hpp"
2330
#include "CfgWeapons.hpp"
31+
32+
#endif

0 commit comments

Comments
 (0)