diff --git a/addons/hitreactions/functions/fnc_fallDown.sqf b/addons/hitreactions/functions/fnc_fallDown.sqf
index 03484438eb..f29b2bcff5 100644
--- a/addons/hitreactions/functions/fnc_fallDown.sqf
+++ b/addons/hitreactions/functions/fnc_fallDown.sqf
@@ -31,8 +31,8 @@ if (_unit == ACE_player) then {
};
// play scream sound
-if (!isNil QEFUNC(medical,playInjuredSound)) then {
- [_unit] call EFUNC(medical,playInjuredSound);
+if (!isNil QEFUNC(medical_engine,playInjuredSound)) then {
+ [_unit] call EFUNC(medical_engine,playInjuredSound);
};
private _vehicle = vehicle _unit;
diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf
index 5f90c0ea2b..961485e8cd 100644
--- a/addons/medical/functions/fnc_displayPatientInformation.sqf
+++ b/addons/medical/functions/fnc_displayPatientInformation.sqf
@@ -181,7 +181,7 @@ if (_show) then {
_logCtrl lbAdd format["%1 %2", _moment, _message];
} foreach _logs;
- private _triageStatus = [_target] call FUNC(getTriageStatus);
+ private _triageStatus = [_target] call EFUNC(medical_treatment,getTriageStatus);
(_display displayCtrl 303) ctrlSetText (_triageStatus select 0);
(_display displayCtrl 303) ctrlSetBackgroundColor (_triageStatus select 2);
diff --git a/addons/medical/functions/fnc_handleStateDefault.sqf b/addons/medical/functions/fnc_handleStateDefault.sqf
index 7ae395effd..404f49779b 100644
--- a/addons/medical/functions/fnc_handleStateDefault.sqf
+++ b/addons/medical/functions/fnc_handleStateDefault.sqf
@@ -22,5 +22,5 @@ systemChat format["handling state default for unit: %1", _this];
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
- [_unit, _pain] call FUNC(playInjuredSound);
+ [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
};
diff --git a/addons/medical/functions/fnc_handleStateInjured.sqf b/addons/medical/functions/fnc_handleStateInjured.sqf
index cdf0b18e7d..c208bea0e0 100644
--- a/addons/medical/functions/fnc_handleStateInjured.sqf
+++ b/addons/medical/functions/fnc_handleStateInjured.sqf
@@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
- [_unit, _pain] call FUNC(playInjuredSound);
+ [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
};
diff --git a/addons/medical/functions/fnc_handleStateRevive.sqf b/addons/medical/functions/fnc_handleStateRevive.sqf
index 4be922a13b..abff476246 100644
--- a/addons/medical/functions/fnc_handleStateRevive.sqf
+++ b/addons/medical/functions/fnc_handleStateRevive.sqf
@@ -51,5 +51,5 @@ if (GVAR(level) >= 2) then {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
- [_unit, _pain] call FUNC(playInjuredSound);
+ [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
};
diff --git a/addons/medical/functions/fnc_handleStateUnconscious.sqf b/addons/medical/functions/fnc_handleStateUnconscious.sqf
index cdf0b18e7d..c208bea0e0 100644
--- a/addons/medical/functions/fnc_handleStateUnconscious.sqf
+++ b/addons/medical/functions/fnc_handleStateUnconscious.sqf
@@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
- [_unit, _pain] call FUNC(playInjuredSound);
+ [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
};
diff --git a/addons/medical_ai/functions/fnc_healSelf.sqf b/addons/medical_ai/functions/fnc_healSelf.sqf
index 3cf8ad75e9..7d495cb8c7 100644
--- a/addons/medical_ai/functions/fnc_healSelf.sqf
+++ b/addons/medical_ai/functions/fnc_healSelf.sqf
@@ -33,7 +33,7 @@ switch (true) do {
};
} forEach _openWounds;
private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex;
- [_this, "Bandage", _selection] call EFUNC(medical,treatmentAdvanced_bandageLocal);
+ [_this, "Bandage", _selection] call EFUNC(medical_treatment,treatmentAdvanced_bandageLocal);
#ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2", _this, _selection];
diff --git a/addons/medical_ai/functions/fnc_healUnit.sqf b/addons/medical_ai/functions/fnc_healUnit.sqf
index 52b0c51e6e..99636bf5f5 100644
--- a/addons/medical_ai/functions/fnc_healUnit.sqf
+++ b/addons/medical_ai/functions/fnc_healUnit.sqf
@@ -62,7 +62,7 @@ switch (true) do {
};
} forEach _openWounds;
private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex;
- [_target, "Bandage", _selection] call EFUNC(medical,treatmentAdvanced_bandageLocal);
+ [_target, "Bandage", _selection] call EFUNC(medical_treatment,treatmentAdvanced_bandageLocal);
#ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2 on %3", _this, _selection, _target];
diff --git a/addons/medical_menu/CfgVehicles.hpp b/addons/medical_menu/CfgVehicles.hpp
index 8bbab667a3..9e227d4305 100644
--- a/addons/medical_menu/CfgVehicles.hpp
+++ b/addons/medical_menu/CfgVehicles.hpp
@@ -48,7 +48,7 @@ class CfgVehicles {
displayName = ECSTRING(medical,Actions_Medical);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical_treatment,displayPatientInformation));
condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
#include "InteractionBodyParts.hpp"
diff --git a/addons/medical_menu/InteractionBodyParts.hpp b/addons/medical_menu/InteractionBodyParts.hpp
index 4814917df1..780a06640d 100644
--- a/addons/medical_menu/InteractionBodyParts.hpp
+++ b/addons/medical_menu/InteractionBodyParts.hpp
@@ -2,7 +2,7 @@ class ACE_Head {
displayName = ECSTRING(interaction,Head);
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,0,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true";
runOnHover = 1;
@@ -13,7 +13,7 @@ class ACE_Torso {
condition = "true";
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 1)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 1)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
showDisabled = 1;
priority = 2;
@@ -23,7 +23,7 @@ class ACE_ArmLeft {
displayName = ECSTRING(interaction,ArmLeft);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 2)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 2)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,2,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@@ -32,7 +32,7 @@ class ACE_ArmRight {
displayName = ECSTRING(interaction,ArmRight);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 3)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 3)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,3,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@@ -41,7 +41,7 @@ class ACE_LegLeft {
displayName = ECSTRING(interaction,LegLeft);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 4)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 4)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,4,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@@ -50,7 +50,7 @@ class ACE_LegRight {
displayName = ECSTRING(interaction,LegRight);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
- statement = QUOTE([ARR_3(_target, true, 5)] call EFUNC(medical,displayPatientInformation));
+ statement = QUOTE([ARR_3(_target, true, 5)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,5,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
diff --git a/addons/medical_treatment/functions/fnc_treatmentAdvanced_fullHealLocal.sqf b/addons/medical_treatment/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
index e76c27a35c..01e656c83f 100644
--- a/addons/medical_treatment/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
@@ -65,6 +65,6 @@ if (alive _target) exitWith {
// Resetting damage
_target setDamage 0;
- [_target, "activity", LSTRING(Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
- [_target, "activity_view", LSTRING(Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); // TODO expand message
+ [_target, "activity", ELSTRING(medical,Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
+ [_target, "activity_view", ELSTRING(medical,Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); // TODO expand message
};