From 67cd0f74483e15c917e369e37d402b0f6cfb5181 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Mon, 9 Oct 2023 21:51:02 +0200 Subject: [PATCH 1/3] Radios of unconscious units are shared --- addons/sys_external/fnc_getSharedExternalRadios.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/sys_external/fnc_getSharedExternalRadios.sqf b/addons/sys_external/fnc_getSharedExternalRadios.sqf index 0527a8bfd..027625fa5 100644 --- a/addons/sys_external/fnc_getSharedExternalRadios.sqf +++ b/addons/sys_external/fnc_getSharedExternalRadios.sqf @@ -20,6 +20,10 @@ params ["_unit"]; private _radios = [_unit] call EFUNC(sys_core,getGear); private _radioList = _radios select {_x call EFUNC(sys_radio,isUniqueRadio)}; -if (!(alive _unit) || {captive _unit}) exitWith {_radioList}; +if ( + !(alive _unit) || + {captive _unit} || + {_unit getVariable ["ACE_isUnconscious", false]} + ) exitWith {_radioList}; _radioList select {[_x, "getState", "radioShared"] call EFUNC(sys_data,dataEvent)} From cd439cb0d5a012a4c0c88ff9232bde853748c6d4 Mon Sep 17 00:00:00 2001 From: Fabio Schick <58027418+mrschick@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:12:42 +0200 Subject: [PATCH 2/3] Use "lifeState" to catch not just ACE's unconsciousness Co-authored-by: Filip Maciejewski --- addons/sys_external/fnc_getSharedExternalRadios.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sys_external/fnc_getSharedExternalRadios.sqf b/addons/sys_external/fnc_getSharedExternalRadios.sqf index 027625fa5..5da2556fb 100644 --- a/addons/sys_external/fnc_getSharedExternalRadios.sqf +++ b/addons/sys_external/fnc_getSharedExternalRadios.sqf @@ -23,7 +23,7 @@ private _radioList = _radios select {_x call EFUNC(sys_radio,isUniqueRadio)}; if ( !(alive _unit) || {captive _unit} || - {_unit getVariable ["ACE_isUnconscious", false]} + {lifeState _unit isEqualTo "INCAPACITATED"} ) exitWith {_radioList}; _radioList select {[_x, "getState", "radioShared"] call EFUNC(sys_data,dataEvent)} From 5d284c579301e3ec1c066fde1e2144b8a3e83b6f Mon Sep 17 00:00:00 2001 From: Fabio Schick <58027418+mrschick@users.noreply.github.com> Date: Thu, 12 Oct 2023 07:31:04 +0200 Subject: [PATCH 3/3] Indent fix Co-authored-by: jonpas --- addons/sys_external/fnc_getSharedExternalRadios.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sys_external/fnc_getSharedExternalRadios.sqf b/addons/sys_external/fnc_getSharedExternalRadios.sqf index 5da2556fb..d7243bba5 100644 --- a/addons/sys_external/fnc_getSharedExternalRadios.sqf +++ b/addons/sys_external/fnc_getSharedExternalRadios.sqf @@ -24,6 +24,6 @@ if ( !(alive _unit) || {captive _unit} || {lifeState _unit isEqualTo "INCAPACITATED"} - ) exitWith {_radioList}; +) exitWith {_radioList}; _radioList select {[_x, "getState", "radioShared"] call EFUNC(sys_data,dataEvent)}