From 452c5216a7e369517b74f8c4c5a0bf17be113d6d Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:16:40 +0200 Subject: [PATCH] Removed skipSetHidden --- addons/medical_status/XEH_postInit.sqf | 6 +++--- addons/medical_status/functions/fnc_setStatusEffects.sqf | 7 ++----- .../medical_status/functions/fnc_setUnconsciousState.sqf | 1 + 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/medical_status/XEH_postInit.sqf b/addons/medical_status/XEH_postInit.sqf index e230693453..4e7ec31a1d 100644 --- a/addons/medical_status/XEH_postInit.sqf +++ b/addons/medical_status/XEH_postInit.sqf @@ -10,10 +10,10 @@ if (_unit isNotEqualTo ACE_player) exitWith {}; - if (_newCamera == "") then { // switched back to player view + if (_newCamera == "") then { // Switched back to player view private _status = IS_UNCONSCIOUS(_unit); - [_unit, _status, true] call FUNC(setStatusEffects); + [_unit, _status] call FUNC(setStatusEffects); } else { - [_unit, false, true] call FUNC(setStatusEffects); + [_unit, false] call FUNC(setStatusEffects); }; }] call CBA_fnc_addPlayerEventHandler; diff --git a/addons/medical_status/functions/fnc_setStatusEffects.sqf b/addons/medical_status/functions/fnc_setStatusEffects.sqf index 9d93354de3..7a7fa01772 100644 --- a/addons/medical_status/functions/fnc_setStatusEffects.sqf +++ b/addons/medical_status/functions/fnc_setStatusEffects.sqf @@ -7,7 +7,6 @@ * Arguments: * 0: The unit * 1: Status effects value - * 2: Skip setHidden (default: false) * * Return Value: * None @@ -15,8 +14,8 @@ * Public: No */ -params ["_unit", "_set", ["_skipSetHidden", false]]; -TRACE_3("setStatusEffect",_unit,_set,_skipSetHidden); +params ["_unit", "_set"]; +TRACE_2("setStatusEffect",_unit,_set); // Block radio on unconsciousness for compatibility with captive module [_unit, "blockRadio", "ace_unconscious", _set] call EFUNC(common,statusEffect_set); @@ -24,7 +23,5 @@ TRACE_3("setStatusEffect",_unit,_set,_skipSetHidden); // Block speaking on unconsciousness [_unit, "blockSpeaking", "ace_unconscious", _set] call EFUNC(common,statusEffect_set); -if (_skipSetHidden) exitWith {}; - // Stop AI firing at unconscious units in most situations (global effect) [_unit, "setHidden", "ace_unconscious", _set] call EFUNC(common,statusEffect_set); diff --git a/addons/medical_status/functions/fnc_setUnconsciousState.sqf b/addons/medical_status/functions/fnc_setUnconsciousState.sqf index 1242e65532..9f0bc1bdc1 100644 --- a/addons/medical_status/functions/fnc_setUnconsciousState.sqf +++ b/addons/medical_status/functions/fnc_setUnconsciousState.sqf @@ -28,6 +28,7 @@ _unit setVariable [VAR_UNCON, _active, true]; // Toggle unit ragdoll state [_unit, _active] call EFUNC(medical_engine,setUnconsciousAnim); +// Set status effects for comms [_unit, _active] call FUNC(setStatusEffects); if (_active) then {