From 6eb9c7e9404b30ca33f635ad893aeca0076b1f24 Mon Sep 17 00:00:00 2001 From: SilentSpike Date: Tue, 8 May 2018 09:17:47 +0100 Subject: [PATCH] Fix medical vitals function calls --- .../functions/fnc_handleStateDefault.sqf | 2 +- .../functions/fnc_handleStateInjured.sqf | 2 +- .../functions/fnc_handleStateUnconscious.sqf | 2 +- addons/medical_vitals/functions/fnc_handleUnitVitals.sqf | 5 +---- addons/medical_vitals/functions/fnc_updateHeartRate.sqf | 2 +- addons/medical_vitals/functions/fnc_updatePainSuppress.sqf | 6 +++--- .../functions/fnc_updatePeripheralResistance.sqf | 4 ++-- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/addons/medical_statemachine/functions/fnc_handleStateDefault.sqf b/addons/medical_statemachine/functions/fnc_handleStateDefault.sqf index 9827f0894e..098ea971a1 100644 --- a/addons/medical_statemachine/functions/fnc_handleStateDefault.sqf +++ b/addons/medical_statemachine/functions/fnc_handleStateDefault.sqf @@ -13,7 +13,7 @@ if (!local _unit) exitWith { _unit setVariable [QGVAR(bloodVolume), _unit getVariable [QGVAR(bloodVolume), DEFAULT_BLOOD_VOLUME], true]; }; -[_unit] call FUNC(handleUnitVitals); +[_unit] call EFUNC(medical_vitals,handleUnitVitals); private _painLevel = GET_PAIN_PERCEIVED(_unit); if (_painLevel > 0) then { diff --git a/addons/medical_statemachine/functions/fnc_handleStateInjured.sqf b/addons/medical_statemachine/functions/fnc_handleStateInjured.sqf index 9827f0894e..098ea971a1 100644 --- a/addons/medical_statemachine/functions/fnc_handleStateInjured.sqf +++ b/addons/medical_statemachine/functions/fnc_handleStateInjured.sqf @@ -13,7 +13,7 @@ if (!local _unit) exitWith { _unit setVariable [QGVAR(bloodVolume), _unit getVariable [QGVAR(bloodVolume), DEFAULT_BLOOD_VOLUME], true]; }; -[_unit] call FUNC(handleUnitVitals); +[_unit] call EFUNC(medical_vitals,handleUnitVitals); private _painLevel = GET_PAIN_PERCEIVED(_unit); if (_painLevel > 0) then { diff --git a/addons/medical_statemachine/functions/fnc_handleStateUnconscious.sqf b/addons/medical_statemachine/functions/fnc_handleStateUnconscious.sqf index d014ac415b..08420c3a8e 100644 --- a/addons/medical_statemachine/functions/fnc_handleStateUnconscious.sqf +++ b/addons/medical_statemachine/functions/fnc_handleStateUnconscious.sqf @@ -14,7 +14,7 @@ if (!local _unit) exitWith { _unit setVariable [QGVAR(bloodVolume), _unit getVariable [QGVAR(bloodVolume), DEFAULT_BLOOD_VOLUME], true]; }; -[_unit] call FUNC(handleUnitVitals); +[_unit] call EFUNC(medical_vitals,handleUnitVitals); private _painLevel = GET_PAIN_PERCEIVED(_unit); if (_painLevel > 0) then { diff --git a/addons/medical_vitals/functions/fnc_handleUnitVitals.sqf b/addons/medical_vitals/functions/fnc_handleUnitVitals.sqf index a3962462f7..0d214ab30c 100644 --- a/addons/medical_vitals/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical_vitals/functions/fnc_handleUnitVitals.sqf @@ -9,10 +9,7 @@ * None * * Example: - * [bob] call ACE_medical_fnc_handleUnitVitals - * - * Example: - * [player] call ace_medical_fnc_handleUnitVitals + * [player] call ace_medical_vitals_fnc_handleUnitVitals * * Public: No */ diff --git a/addons/medical_vitals/functions/fnc_updateHeartRate.sqf b/addons/medical_vitals/functions/fnc_updateHeartRate.sqf index 2a19f64626..e5dad868bd 100644 --- a/addons/medical_vitals/functions/fnc_updateHeartRate.sqf +++ b/addons/medical_vitals/functions/fnc_updateHeartRate.sqf @@ -11,7 +11,7 @@ * Current Heart Rate * * Example: - * [player, 1, false] call ace_medical_fnc_updateHeartRate + * [player, 1, false] call ace_medical_vitals_fnc_updateHeartRate * * Public: No */ diff --git a/addons/medical_vitals/functions/fnc_updatePainSuppress.sqf b/addons/medical_vitals/functions/fnc_updatePainSuppress.sqf index 8e2b15214f..3d9183647e 100644 --- a/addons/medical_vitals/functions/fnc_updatePainSuppress.sqf +++ b/addons/medical_vitals/functions/fnc_updatePainSuppress.sqf @@ -7,8 +7,8 @@ * 1: Time since last update * 2: Sync value? * - * ReturnValue: - * nothing + * Return Value: + * None * * Public: No */ @@ -39,7 +39,7 @@ if (!(_adjustment isEqualTo [])) then { _adjustment = _adjustment - [ObjNull]; _unit setVariable [QGVAR(painSupressAdjustments), _adjustment, (_syncValue || {_adjustment isEqualTo []})]; // always sync on last run - + _unit setVariable [QGVAR(painSuppress), 0 max _painSupressAdjustment, _syncValue]; }; diff --git a/addons/medical_vitals/functions/fnc_updatePeripheralResistance.sqf b/addons/medical_vitals/functions/fnc_updatePeripheralResistance.sqf index 48ba96f2b9..45184be37e 100644 --- a/addons/medical_vitals/functions/fnc_updatePeripheralResistance.sqf +++ b/addons/medical_vitals/functions/fnc_updatePeripheralResistance.sqf @@ -7,8 +7,8 @@ * 1: Time since last update * 2: Sync value? * - * ReturnValue: - * nothing + * Return Value: + * None * * Public: No */