From 18999549d50ca489e8746512849fb1ebe3ca9a5b Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Tue, 10 Jun 2025 21:18:11 +0200 Subject: [PATCH 1/3] Make separate subaddons for medical damage configs --- .../ACE_Medical_Injuries.hpp | 1 - .../compat_sog_medical_damage/config.cpp | 20 +++++++++++++++++++ .../script_component.hpp | 3 +++ addons/compat_sog/config.cpp | 1 - .../ACE_Medical_Injuries.hpp | 1 - .../compat_spe_medical_damage/config.cpp | 20 +++++++++++++++++++ .../script_component.hpp | 3 +++ addons/compat_spe/config.cpp | 1 - .../ACE_Medical_Injuries.hpp | 0 .../compat_medical_damage/config.cpp | 20 +++++++++++++++++++ .../script_component.hpp | 3 +++ addons/explosives/config.cpp | 1 - 12 files changed, 69 insertions(+), 5 deletions(-) rename addons/compat_sog/{ => compat_sog_medical_damage}/ACE_Medical_Injuries.hpp (99%) create mode 100644 addons/compat_sog/compat_sog_medical_damage/config.cpp create mode 100644 addons/compat_sog/compat_sog_medical_damage/script_component.hpp rename addons/compat_spe/{ => compat_spe_medical_damage}/ACE_Medical_Injuries.hpp (99%) create mode 100644 addons/compat_spe/compat_spe_medical_damage/config.cpp create mode 100644 addons/compat_spe/compat_spe_medical_damage/script_component.hpp rename addons/explosives/{ => compat_medical_damage}/ACE_Medical_Injuries.hpp (100%) create mode 100644 addons/explosives/compat_medical_damage/config.cpp create mode 100644 addons/explosives/compat_medical_damage/script_component.hpp diff --git a/addons/compat_sog/ACE_Medical_Injuries.hpp b/addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp similarity index 99% rename from addons/compat_sog/ACE_Medical_Injuries.hpp rename to addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp index 9f01a97f613..833f4f6ac2f 100644 --- a/addons/compat_sog/ACE_Medical_Injuries.hpp +++ b/addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp @@ -1,7 +1,6 @@ class ACE_Medical_Injuries { class damageTypes { class woundHandlers; - class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/compat_sog/compat_sog_medical_damage/config.cpp b/addons/compat_sog/compat_sog_medical_damage/config.cpp new file mode 100644 index 00000000000..5886cb75317 --- /dev/null +++ b/addons/compat_sog/compat_sog_medical_damage/config.cpp @@ -0,0 +1,20 @@ +#include "script_component.hpp" + +class CfgPatches { + class SUBADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + + addonRootClass = QUOTE(ADDON); + }; +}; + +#include "ACE_Medical_Injuries.hpp" diff --git a/addons/compat_sog/compat_sog_medical_damage/script_component.hpp b/addons/compat_sog/compat_sog_medical_damage/script_component.hpp new file mode 100644 index 00000000000..d815ab13360 --- /dev/null +++ b/addons/compat_sog/compat_sog_medical_damage/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT medical_damage +#define SUBCOMPONENT_BEAUTIFIED Medical Damage +#include "..\script_component.hpp" diff --git a/addons/compat_sog/config.cpp b/addons/compat_sog/config.cpp index 21fa20ccbc7..011d44ef7eb 100644 --- a/addons/compat_sog/config.cpp +++ b/addons/compat_sog/config.cpp @@ -47,7 +47,6 @@ class CfgPatches { class CBA_Extended_EventHandlers; #include "ACE_CSW_Groups.hpp" -#include "ACE_Medical_Injuries.hpp" #include "ACE_Triggers.hpp" #include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" diff --git a/addons/compat_spe/ACE_Medical_Injuries.hpp b/addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp similarity index 99% rename from addons/compat_spe/ACE_Medical_Injuries.hpp rename to addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp index 9f01a97f613..833f4f6ac2f 100644 --- a/addons/compat_spe/ACE_Medical_Injuries.hpp +++ b/addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp @@ -1,7 +1,6 @@ class ACE_Medical_Injuries { class damageTypes { class woundHandlers; - class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/compat_spe/compat_spe_medical_damage/config.cpp b/addons/compat_spe/compat_spe_medical_damage/config.cpp new file mode 100644 index 00000000000..5886cb75317 --- /dev/null +++ b/addons/compat_spe/compat_spe_medical_damage/config.cpp @@ -0,0 +1,20 @@ +#include "script_component.hpp" + +class CfgPatches { + class SUBADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + + addonRootClass = QUOTE(ADDON); + }; +}; + +#include "ACE_Medical_Injuries.hpp" diff --git a/addons/compat_spe/compat_spe_medical_damage/script_component.hpp b/addons/compat_spe/compat_spe_medical_damage/script_component.hpp new file mode 100644 index 00000000000..d815ab13360 --- /dev/null +++ b/addons/compat_spe/compat_spe_medical_damage/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT medical_damage +#define SUBCOMPONENT_BEAUTIFIED Medical Damage +#include "..\script_component.hpp" diff --git a/addons/compat_spe/config.cpp b/addons/compat_spe/config.cpp index 13bd24f53dd..affa90a5d32 100644 --- a/addons/compat_spe/config.cpp +++ b/addons/compat_spe/config.cpp @@ -27,7 +27,6 @@ class CfgPatches { }; }; -#include "ACE_Medical_Injuries.hpp" #include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" #include "CfgGlasses.hpp" diff --git a/addons/explosives/ACE_Medical_Injuries.hpp b/addons/explosives/compat_medical_damage/ACE_Medical_Injuries.hpp similarity index 100% rename from addons/explosives/ACE_Medical_Injuries.hpp rename to addons/explosives/compat_medical_damage/ACE_Medical_Injuries.hpp diff --git a/addons/explosives/compat_medical_damage/config.cpp b/addons/explosives/compat_medical_damage/config.cpp new file mode 100644 index 00000000000..5886cb75317 --- /dev/null +++ b/addons/explosives/compat_medical_damage/config.cpp @@ -0,0 +1,20 @@ +#include "script_component.hpp" + +class CfgPatches { + class SUBADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + + addonRootClass = QUOTE(ADDON); + }; +}; + +#include "ACE_Medical_Injuries.hpp" diff --git a/addons/explosives/compat_medical_damage/script_component.hpp b/addons/explosives/compat_medical_damage/script_component.hpp new file mode 100644 index 00000000000..d815ab13360 --- /dev/null +++ b/addons/explosives/compat_medical_damage/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT medical_damage +#define SUBCOMPONENT_BEAUTIFIED Medical Damage +#include "..\script_component.hpp" diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 06331ef9f4e..1e0294b740e 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -24,7 +24,6 @@ class CfgPatches { #include "ACE_Triggers.hpp" #include "ACE_Arsenal_Stats.hpp" -#include "ACE_Medical_Injuries.hpp" // UI stuff class RscText; From fe5a8ad7f37626c4cf6ee7db7fdbf0b57579a715 Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:17:38 +0200 Subject: [PATCH 2/3] Revert "Make separate subaddons for medical damage configs" This reverts commit 18999549d50ca489e8746512849fb1ebe3ca9a5b. --- .../ACE_Medical_Injuries.hpp | 1 + .../compat_sog_medical_damage/config.cpp | 20 ------------------- .../script_component.hpp | 3 --- addons/compat_sog/config.cpp | 1 + .../ACE_Medical_Injuries.hpp | 1 + .../compat_spe_medical_damage/config.cpp | 20 ------------------- .../script_component.hpp | 3 --- addons/compat_spe/config.cpp | 1 + .../ACE_Medical_Injuries.hpp | 0 .../compat_medical_damage/config.cpp | 20 ------------------- .../script_component.hpp | 3 --- addons/explosives/config.cpp | 1 + 12 files changed, 5 insertions(+), 69 deletions(-) rename addons/compat_sog/{compat_sog_medical_damage => }/ACE_Medical_Injuries.hpp (99%) delete mode 100644 addons/compat_sog/compat_sog_medical_damage/config.cpp delete mode 100644 addons/compat_sog/compat_sog_medical_damage/script_component.hpp rename addons/compat_spe/{compat_spe_medical_damage => }/ACE_Medical_Injuries.hpp (99%) delete mode 100644 addons/compat_spe/compat_spe_medical_damage/config.cpp delete mode 100644 addons/compat_spe/compat_spe_medical_damage/script_component.hpp rename addons/explosives/{compat_medical_damage => }/ACE_Medical_Injuries.hpp (100%) delete mode 100644 addons/explosives/compat_medical_damage/config.cpp delete mode 100644 addons/explosives/compat_medical_damage/script_component.hpp diff --git a/addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp b/addons/compat_sog/ACE_Medical_Injuries.hpp similarity index 99% rename from addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp rename to addons/compat_sog/ACE_Medical_Injuries.hpp index 833f4f6ac2f..9f01a97f613 100644 --- a/addons/compat_sog/compat_sog_medical_damage/ACE_Medical_Injuries.hpp +++ b/addons/compat_sog/ACE_Medical_Injuries.hpp @@ -1,6 +1,7 @@ class ACE_Medical_Injuries { class damageTypes { class woundHandlers; + class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/compat_sog/compat_sog_medical_damage/config.cpp b/addons/compat_sog/compat_sog_medical_damage/config.cpp deleted file mode 100644 index 5886cb75317..00000000000 --- a/addons/compat_sog/compat_sog_medical_damage/config.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class SUBADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; - skipWhenMissingDependencies = 1; - author = ECSTRING(common,ACETeam); - authors[] = {}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - - addonRootClass = QUOTE(ADDON); - }; -}; - -#include "ACE_Medical_Injuries.hpp" diff --git a/addons/compat_sog/compat_sog_medical_damage/script_component.hpp b/addons/compat_sog/compat_sog_medical_damage/script_component.hpp deleted file mode 100644 index d815ab13360..00000000000 --- a/addons/compat_sog/compat_sog_medical_damage/script_component.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#define SUBCOMPONENT medical_damage -#define SUBCOMPONENT_BEAUTIFIED Medical Damage -#include "..\script_component.hpp" diff --git a/addons/compat_sog/config.cpp b/addons/compat_sog/config.cpp index 011d44ef7eb..21fa20ccbc7 100644 --- a/addons/compat_sog/config.cpp +++ b/addons/compat_sog/config.cpp @@ -47,6 +47,7 @@ class CfgPatches { class CBA_Extended_EventHandlers; #include "ACE_CSW_Groups.hpp" +#include "ACE_Medical_Injuries.hpp" #include "ACE_Triggers.hpp" #include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" diff --git a/addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp b/addons/compat_spe/ACE_Medical_Injuries.hpp similarity index 99% rename from addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp rename to addons/compat_spe/ACE_Medical_Injuries.hpp index 833f4f6ac2f..9f01a97f613 100644 --- a/addons/compat_spe/compat_spe_medical_damage/ACE_Medical_Injuries.hpp +++ b/addons/compat_spe/ACE_Medical_Injuries.hpp @@ -1,6 +1,7 @@ class ACE_Medical_Injuries { class damageTypes { class woundHandlers; + class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/compat_spe/compat_spe_medical_damage/config.cpp b/addons/compat_spe/compat_spe_medical_damage/config.cpp deleted file mode 100644 index 5886cb75317..00000000000 --- a/addons/compat_spe/compat_spe_medical_damage/config.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class SUBADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; - skipWhenMissingDependencies = 1; - author = ECSTRING(common,ACETeam); - authors[] = {}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - - addonRootClass = QUOTE(ADDON); - }; -}; - -#include "ACE_Medical_Injuries.hpp" diff --git a/addons/compat_spe/compat_spe_medical_damage/script_component.hpp b/addons/compat_spe/compat_spe_medical_damage/script_component.hpp deleted file mode 100644 index d815ab13360..00000000000 --- a/addons/compat_spe/compat_spe_medical_damage/script_component.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#define SUBCOMPONENT medical_damage -#define SUBCOMPONENT_BEAUTIFIED Medical Damage -#include "..\script_component.hpp" diff --git a/addons/compat_spe/config.cpp b/addons/compat_spe/config.cpp index affa90a5d32..13bd24f53dd 100644 --- a/addons/compat_spe/config.cpp +++ b/addons/compat_spe/config.cpp @@ -27,6 +27,7 @@ class CfgPatches { }; }; +#include "ACE_Medical_Injuries.hpp" #include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" #include "CfgGlasses.hpp" diff --git a/addons/explosives/compat_medical_damage/ACE_Medical_Injuries.hpp b/addons/explosives/ACE_Medical_Injuries.hpp similarity index 100% rename from addons/explosives/compat_medical_damage/ACE_Medical_Injuries.hpp rename to addons/explosives/ACE_Medical_Injuries.hpp diff --git a/addons/explosives/compat_medical_damage/config.cpp b/addons/explosives/compat_medical_damage/config.cpp deleted file mode 100644 index 5886cb75317..00000000000 --- a/addons/explosives/compat_medical_damage/config.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class SUBADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {QUOTE(ADDON), "ace_medical_damage"}; - skipWhenMissingDependencies = 1; - author = ECSTRING(common,ACETeam); - authors[] = {}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - - addonRootClass = QUOTE(ADDON); - }; -}; - -#include "ACE_Medical_Injuries.hpp" diff --git a/addons/explosives/compat_medical_damage/script_component.hpp b/addons/explosives/compat_medical_damage/script_component.hpp deleted file mode 100644 index d815ab13360..00000000000 --- a/addons/explosives/compat_medical_damage/script_component.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#define SUBCOMPONENT medical_damage -#define SUBCOMPONENT_BEAUTIFIED Medical Damage -#include "..\script_component.hpp" diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 1e0294b740e..06331ef9f4e 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -24,6 +24,7 @@ class CfgPatches { #include "ACE_Triggers.hpp" #include "ACE_Arsenal_Stats.hpp" +#include "ACE_Medical_Injuries.hpp" // UI stuff class RscText; From fb3f33a6ed222794668cd01397a07085b212211a Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Thu, 19 Jun 2025 13:21:39 +0200 Subject: [PATCH 3/3] Fix load issues with medical injuries --- addons/compat_sog/ACE_Medical_Injuries.hpp | 3 +-- addons/compat_spe/ACE_Medical_Injuries.hpp | 3 +-- addons/explosives/ACE_Medical_Injuries.hpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/compat_sog/ACE_Medical_Injuries.hpp b/addons/compat_sog/ACE_Medical_Injuries.hpp index 9f01a97f613..6566d11ead7 100644 --- a/addons/compat_sog/ACE_Medical_Injuries.hpp +++ b/addons/compat_sog/ACE_Medical_Injuries.hpp @@ -1,7 +1,6 @@ class ACE_Medical_Injuries { class damageTypes { - class woundHandlers; - + class woundHandlers {}; class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/compat_spe/ACE_Medical_Injuries.hpp b/addons/compat_spe/ACE_Medical_Injuries.hpp index 9f01a97f613..6566d11ead7 100644 --- a/addons/compat_spe/ACE_Medical_Injuries.hpp +++ b/addons/compat_spe/ACE_Medical_Injuries.hpp @@ -1,7 +1,6 @@ class ACE_Medical_Injuries { class damageTypes { - class woundHandlers; - + class woundHandlers {}; class explosive { class woundHandlers: woundHandlers {}; }; diff --git a/addons/explosives/ACE_Medical_Injuries.hpp b/addons/explosives/ACE_Medical_Injuries.hpp index ef316361531..10289b7282f 100644 --- a/addons/explosives/ACE_Medical_Injuries.hpp +++ b/addons/explosives/ACE_Medical_Injuries.hpp @@ -1,6 +1,6 @@ class ACE_Medical_Injuries { class damageTypes { - class woundHandlers; + class woundHandlers {}; class explosive { class woundHandlers: woundHandlers {}; };