From 039af66a8f8ef253870c61ae53d800d5a0f7cc13 Mon Sep 17 00:00:00 2001
From: Salluci <69561145+Salluci@users.noreply.github.com>
Date: Mon, 23 Aug 2021 20:27:00 -0300
Subject: [PATCH] Medical - Fix #8389 (#8390)

* fix implicit dependency between medical damage and medical engine

* move stringtable

* valve pls fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---
 addons/medical_damage/initSettings.sqf |  9 ---------
 addons/medical_damage/stringtable.xml  | 12 ------------
 addons/medical_engine/XEH_preInit.sqf  |  2 ++
 addons/medical_engine/initSettings.sqf |  8 ++++++++
 addons/medical_engine/stringtable.xml  | 17 +++++++++++++++++
 5 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 addons/medical_engine/initSettings.sqf
 create mode 100644 addons/medical_engine/stringtable.xml

diff --git a/addons/medical_damage/initSettings.sqf b/addons/medical_damage/initSettings.sqf
index 5d9003addf9..14dac50f1a5 100644
--- a/addons/medical_damage/initSettings.sqf
+++ b/addons/medical_damage/initSettings.sqf
@@ -42,12 +42,3 @@
     [0, 1, 1, 2, true],
     true
 ] call CBA_fnc_addSetting;
-
-[
-    QEGVAR(medical,enableVehicleCrashes),
-    "CHECKBOX",
-    [LSTRING(EnableVehicleCrashes_DisplayName), LSTRING(EnableVehicleCrashes_Description)],
-    ELSTRING(medical,Category),
-    true,
-    true
-] call CBA_fnc_addSetting;
diff --git a/addons/medical_damage/stringtable.xml b/addons/medical_damage/stringtable.xml
index 9eb02461685..7d3619e9ded 100644
--- a/addons/medical_damage/stringtable.xml
+++ b/addons/medical_damage/stringtable.xml
@@ -717,17 +717,5 @@
             <Spanish>La probabilidad de morir a causa de una herida fatal.</Spanish>
             <French>La probabilité de mourir lors d'une "blessure mortelle".\nUne blessure mortelle est définie par des dommages importants à la tête ou au cœur.</French>
         </Key>
-        <Key ID="STR_ACE_Medical_Damage_EnableVehicleCrashes_DisplayName">
-            <English>Enable Vehicle Crash Damage</English>
-            <Russian>Включить урон при аварии в транспортном средстве.</Russian>
-            <Spanish>Activar daño por accidente de vehículo</Spanish>
-            <French>Blessures de collision (véhicules)</French>
-        </Key>
-        <Key ID="STR_ACE_Medical_Damage_EnableVehicleCrashes_Description">
-            <English>Controls whether crew receives damage from vehicle collisions.</English>
-            <Russian>Контролирует, получает ли экипаж урон от столкновения транспортного средства.</Russian>
-            <Spanish>Controla si la tripulación recibe daño debido a colisiones en vehículo.</Spanish>
-            <French>Définit si les passagers à bord des véhicules peuvent être blessés en cas d'accident.</French>
-        </Key>
     </Package>
 </Project>
diff --git a/addons/medical_engine/XEH_preInit.sqf b/addons/medical_engine/XEH_preInit.sqf
index 429bdc8acb8..71c7a86595a 100644
--- a/addons/medical_engine/XEH_preInit.sqf
+++ b/addons/medical_engine/XEH_preInit.sqf
@@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+#include "initSettings.sqf"
+
 // Define "Constants" variables (both are macros defined in script_macros_medical.hpp, look there for actual variable names)
 if (isNil QUOTE(HEAD_DAMAGE_THRESHOLD)) then {HEAD_DAMAGE_THRESHOLD = HEAD_DAMAGE_THRESHOLD_DEFAULT};
 if (isNil QUOTE(ORGAN_DAMAGE_THRESHOLD)) then {ORGAN_DAMAGE_THRESHOLD = ORGAN_DAMAGE_THRESHOLD_DEFAULT};
diff --git a/addons/medical_engine/initSettings.sqf b/addons/medical_engine/initSettings.sqf
new file mode 100644
index 00000000000..9fe80afcb00
--- /dev/null
+++ b/addons/medical_engine/initSettings.sqf
@@ -0,0 +1,8 @@
+[
+    QEGVAR(medical,enableVehicleCrashes),
+    "CHECKBOX",
+    [LSTRING(EnableVehicleCrashes_DisplayName), LSTRING(EnableVehicleCrashes_Description)],
+    ELSTRING(medical,Category),
+    true,
+    true
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_engine/stringtable.xml b/addons/medical_engine/stringtable.xml
new file mode 100644
index 00000000000..68944018951
--- /dev/null
+++ b/addons/medical_engine/stringtable.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="Medical_Engine">
+        <Key ID="STR_ACE_Medical_Engine_EnableVehicleCrashes_DisplayName">
+            <English>Enable Vehicle Crash Damage</English>
+            <Russian>Включить урон при аварии в транспортном средстве.</Russian>
+            <Spanish>Activar daño por accidente de vehículo</Spanish>
+            <French>Blessures de collision (véhicules)</French>
+        </Key>
+        <Key ID="STR_ACE_Medical_Engine_EnableVehicleCrashes_Description">
+            <English>Controls whether crew receives damage from vehicle collisions.</English>
+            <Russian>Контролирует, получает ли экипаж урон от столкновения транспортного средства.</Russian>
+            <Spanish>Controla si la tripulación recibe daño debido a colisiones en vehículo.</Spanish>
+            <French>Définit si les passagers à bord des véhicules peuvent être blessés en cas d'accident.</French>
+        </Key>
+    </Package>
+</Project>