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>
acemod · Aug 23, 2021 · 039af66 · 039af66
1 parent 83cbec7
commit 039af66
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>