From 9f6baca424b26a733c92c3d4253e72ef3e219a51 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Mon, 26 Sep 2016 20:25:14 +0200
Subject: [PATCH] port injury parse fnc to medical damage

---
 addons/medical/XEH_PREP.hpp                                 | 1 -
 addons/medical/XEH_preInit.sqf                              | 1 -
 addons/medical/config.cpp                                   | 1 -
 addons/{medical => medical_damage}/ACE_Medical_Injuries.hpp | 0
 addons/medical_damage/XEH_PREP.hpp                          | 2 ++
 addons/medical_damage/XEH_preInit.sqf                       | 2 ++
 addons/medical_damage/config.cpp                            | 2 ++
 .../functions/fnc_parseConfigForInjuries.sqf                | 0
 addons/medical_damage/script_component.hpp                  | 6 +++---
 addons/medical_engine/script_component.hpp                  | 6 +++---
 10 files changed, 12 insertions(+), 9 deletions(-)
 rename addons/{medical => medical_damage}/ACE_Medical_Injuries.hpp (100%)
 rename addons/{medical => medical_damage}/functions/fnc_parseConfigForInjuries.sqf (100%)

diff --git a/addons/medical/XEH_PREP.hpp b/addons/medical/XEH_PREP.hpp
index 5c3080e65a..2253bc32b5 100644
--- a/addons/medical/XEH_PREP.hpp
+++ b/addons/medical/XEH_PREP.hpp
@@ -15,7 +15,6 @@ PREP(isInMedicalVehicle);
 PREP(isInStableCondition);
 PREP(isMedic);
 PREP(isMedicalVehicle);
-PREP(parseConfigForInjuries);
 PREP(selectionNameToNumber);
 PREP(setHitPointDamage);
 PREP(setStructuralDamage);
diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf
index 49edd8810b..c05293cd36 100644
--- a/addons/medical/XEH_preInit.sqf
+++ b/addons/medical/XEH_preInit.sqf
@@ -7,7 +7,6 @@ ADDON = false;
 GVAR(HITPOINTS) = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"];
 GVAR(SELECTIONS) = ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"];
 
-call FUNC(parseConfigForInjuries);
 GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call FUNC(createStateMachine);
 
 ADDON = true;
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index 3fb031bc46..d50eb49494 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -15,7 +15,6 @@ class CfgPatches {
 };
 
 #include "ACE_Settings.hpp"
-#include "ACE_Medical_Injuries.hpp"
 #include "ACE_Medical_StateMachine.hpp"
 
 #include "CfgEden.hpp"
diff --git a/addons/medical/ACE_Medical_Injuries.hpp b/addons/medical_damage/ACE_Medical_Injuries.hpp
similarity index 100%
rename from addons/medical/ACE_Medical_Injuries.hpp
rename to addons/medical_damage/ACE_Medical_Injuries.hpp
diff --git a/addons/medical_damage/XEH_PREP.hpp b/addons/medical_damage/XEH_PREP.hpp
index 0ba5acfb2a..35678974ce 100644
--- a/addons/medical_damage/XEH_PREP.hpp
+++ b/addons/medical_damage/XEH_PREP.hpp
@@ -2,5 +2,7 @@ PREP(airwayHandler);
 PREP(fracturesHandler);
 PREP(getTypeOfDamage);
 PREP(internalInjuriesHandler);
+
+PREP(parseConfigForInjuries);
 PREP(woundsHandler);
 PREP(woundsHandlerSqf);
diff --git a/addons/medical_damage/XEH_preInit.sqf b/addons/medical_damage/XEH_preInit.sqf
index 97926965c7..6d77922974 100644
--- a/addons/medical_damage/XEH_preInit.sqf
+++ b/addons/medical_damage/XEH_preInit.sqf
@@ -4,6 +4,8 @@ ADDON = false;
 
 #include "XEH_PREP.hpp"
 
+call FUNC(parseConfigForInjuries);
+
 [QEGVAR(medical_engine,woundReceived), {
     params ["_unit", "_woundedHitPoint", "_receivedDamage", "", "_ammo"];
 
diff --git a/addons/medical_damage/config.cpp b/addons/medical_damage/config.cpp
index 60cad71f28..008bdc3a39 100644
--- a/addons/medical_damage/config.cpp
+++ b/addons/medical_damage/config.cpp
@@ -14,4 +14,6 @@ class CfgPatches {
     };
 };
 
+#include "ACE_Medical_Injuries.hpp"
+
 #include "CfgEventHandlers.hpp"
diff --git a/addons/medical/functions/fnc_parseConfigForInjuries.sqf b/addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf
similarity index 100%
rename from addons/medical/functions/fnc_parseConfigForInjuries.sqf
rename to addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf
diff --git a/addons/medical_damage/script_component.hpp b/addons/medical_damage/script_component.hpp
index 021378225f..fed195ddfa 100644
--- a/addons/medical_damage/script_component.hpp
+++ b/addons/medical_damage/script_component.hpp
@@ -2,9 +2,9 @@
 #define COMPONENT_BEAUTIFIED Medical Damage
 #include "\z\ace\addons\main\script_mod.hpp"
 
-//#define DEBUG_MODE_FULL
-//#define DISABLE_COMPILE_CACHE
-//#define CBA_DEBUG_SYNCHRONOUS
+#define DEBUG_MODE_FULL
+#define DISABLE_COMPILE_CACHE
+#define CBA_DEBUG_SYNCHRONOUS
 #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_MEDICAL_DAMAGE
diff --git a/addons/medical_engine/script_component.hpp b/addons/medical_engine/script_component.hpp
index cdaf58b0e5..4f7a9a7c5a 100644
--- a/addons/medical_engine/script_component.hpp
+++ b/addons/medical_engine/script_component.hpp
@@ -2,9 +2,9 @@
 #define COMPONENT_BEAUTIFIED Medical (Engine)
 #include "\z\ace\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
-#define DISABLE_COMPILE_CACHE
-#define CBA_DEBUG_SYNCHRONOUS
+//#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
+//#define CBA_DEBUG_SYNCHRONOUS
 //#define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_MEDICAL_ENGINE