From 06ad41e241dbee7e799536f65cdfbd186860dc36 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:11:55 -0800 Subject: [PATCH 1/8] Small Fixes --- addons/chemical/functions/fnc_poison.sqf | 2 +- addons/watch/XEH_PREP.hpp | 4 ++-- addons/watch/XEH_postInit.sqf | 9 +++------ addons/watch/functions/fnc_handleRespawn.sqf | 4 ++-- addons/watch/functions/fnc_showRWatch.sqf | 17 ++--------------- ...seWatchTimer.sqf => fnc_startWatchTimer.sqf} | 6 ++---- 6 files changed, 12 insertions(+), 30 deletions(-) rename addons/watch/functions/{fnc_closeWatchTimer.sqf => fnc_startWatchTimer.sqf} (96%) diff --git a/addons/chemical/functions/fnc_poison.sqf b/addons/chemical/functions/fnc_poison.sqf index 84e117e8f..1d9b58459 100644 --- a/addons/chemical/functions/fnc_poison.sqf +++ b/addons/chemical/functions/fnc_poison.sqf @@ -45,7 +45,7 @@ if (_gasLevel == 0) exitWith { }; // We assume that oxygen masks only cover the mouth and nose, leaving the eyes exposed to CS gas -if ((_unit getVariable [QEGVAR(breathing,oxygenMaskActive)])) exitWith { +if ((_unit getVariable [QEGVAR(breathing,oxygenMaskActive), false])) exitWith { TRACE_1("unit has oxygen mask",_unit); }; diff --git a/addons/watch/XEH_PREP.hpp b/addons/watch/XEH_PREP.hpp index d97090421..eeb625ae7 100644 --- a/addons/watch/XEH_PREP.hpp +++ b/addons/watch/XEH_PREP.hpp @@ -1,4 +1,3 @@ -PREP(closeWatchTimer); PREP(handleRespawn); PREP(hideKWatch); PREP(hideCWatch); @@ -8,4 +7,5 @@ PREP(init); PREP(showKWatch); PREP(showCWatch); PREP(showSWatch); -PREP(showRWatch); \ No newline at end of file +PREP(showRWatch); +PREP(startWatchTimer); \ No newline at end of file diff --git a/addons/watch/XEH_postInit.sqf b/addons/watch/XEH_postInit.sqf index fc4683fb8..2d8de495e 100644 --- a/addons/watch/XEH_postInit.sqf +++ b/addons/watch/XEH_postInit.sqf @@ -2,7 +2,7 @@ if (!hasInterface) exitWith {}; -[QGVAR(closeWatchTimer), LINKFUNC(closeWatchTimer)] call CBA_fnc_addEventHandler; +[QGVAR(startWatchTimer), LINKFUNC(startWatchTimer)] call CBA_fnc_addEventHandler; [QEGVAR(misc,handleRespawn), LINKFUNC(handleRespawn)] call CBA_fnc_addEventHandler; [QGVAR(playWatchTone), { @@ -51,7 +51,7 @@ if (!hasInterface) exitWith {}; [ACE_player] call FUNC(showRWatch); } else { call FUNC(hideRWatch); - }; + }; }; }; @@ -96,11 +96,8 @@ if (!hasInterface) exitWith {}; if (_timerActive) then { ACE_player setVariable [QGVAR(rangerStart), false, false]; } else { - if !(GETMVAR(GVAR(RangerActive),false)) then { - [QGVAR(closeWatchTimer), [ACE_player], ACE_player] call CBA_fnc_targetEvent; - }; - ACE_player setVariable [QGVAR(rangerStart), true, false]; + [QGVAR(startWatchTimer), [ACE_player], ACE_player] call CBA_fnc_targetEvent; }; }; diff --git a/addons/watch/functions/fnc_handleRespawn.sqf b/addons/watch/functions/fnc_handleRespawn.sqf index ed450e087..eb6257b23 100644 --- a/addons/watch/functions/fnc_handleRespawn.sqf +++ b/addons/watch/functions/fnc_handleRespawn.sqf @@ -20,5 +20,5 @@ params ["_unit","_dead"]; TRACE_2("handleRespawn",_unit,_dead); -_unit setVariable [QGVAR(RangerStart), false, true]; -_unit setVariable [QGVAR(RangerTimer), 0, true]; \ No newline at end of file +_unit setVariable [QGVAR(rangerStart), false, true]; +_unit setVariable [QGVAR(rangerTimer), 0, true]; \ No newline at end of file diff --git a/addons/watch/functions/fnc_showRWatch.sqf b/addons/watch/functions/fnc_showRWatch.sqf index d2cb346e7..23b63216e 100644 --- a/addons/watch/functions/fnc_showRWatch.sqf +++ b/addons/watch/functions/fnc_showRWatch.sqf @@ -54,6 +54,8 @@ private _o2 = _display displayCtrl 22810; _pfhID call CBA_fnc_removePerFrameHandler; }; + _unit setVariable [QGVAR(rangerPFH), _pfhID, false]; + private _altitudeValue = round((getPosASL _unit) select 2); if (GVAR(altitudeUnit) == 1) then { @@ -82,23 +84,8 @@ private _o2 = _display displayCtrl 22810; _second ctrlSetAngle [(linearConversion [0, 60, _seconds, 0, 360]), 0.5, 0.5, true]; private _timeValue = _unit getVariable [QGVAR(rangerTimer), 0]; - private _active = _unit getVariable [QGVAR(rangerStart), false]; _timer ctrlSetText ([_timeValue, 2, 0] call CBA_fnc_formatNumber); - - if (_active) then { - _timeValue = (_timeValue - 1) max 0; - - _timer ctrlSetText ([_timeValue, 2, 0] call CBA_fnc_formatNumber); - _unit setVariable [QGVAR(rangerTimer), _timeValue, false]; - - if (_timeValue == 0) then { - _unit setVariable [QGVAR(rangerStart), false, false]; - [QGVAR(playWatchTone), [_unit, QGVAR(watchAlarm)], _unit] call CBA_fnc_targetEvent; - }; - } else { - _timer ctrlSetText ([_timeValue, 2, 0] call CBA_fnc_formatNumber); - }; }, 1, [ _unit, _hour, diff --git a/addons/watch/functions/fnc_closeWatchTimer.sqf b/addons/watch/functions/fnc_startWatchTimer.sqf similarity index 96% rename from addons/watch/functions/fnc_closeWatchTimer.sqf rename to addons/watch/functions/fnc_startWatchTimer.sqf index 657ec0cbb..e8dc43a67 100644 --- a/addons/watch/functions/fnc_closeWatchTimer.sqf +++ b/addons/watch/functions/fnc_startWatchTimer.sqf @@ -21,10 +21,6 @@ params ["_unit"]; _this params ["_args", "_pfhID"]; _args params ["_unit"]; - if (GVAR(RangerActive)) exitWith { - _pfhID call CBA_fnc_removePerFrameHandler; - }; - if !(alive _unit) exitWith { _pfhID call CBA_fnc_removePerFrameHandler; }; @@ -47,5 +43,7 @@ params ["_unit"]; _pfhID call CBA_fnc_removePerFrameHandler; }; + } else { + _pfhID call CBA_fnc_removePerFrameHandler; }; }, 1, [_unit]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file From ba651b4cdbd1aca26e935b382776a76d709fbb19 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:18:59 -0800 Subject: [PATCH 2/8] Update fnc_showRWatch.sqf --- addons/watch/functions/fnc_showRWatch.sqf | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/watch/functions/fnc_showRWatch.sqf b/addons/watch/functions/fnc_showRWatch.sqf index 23b63216e..42fa41d8e 100644 --- a/addons/watch/functions/fnc_showRWatch.sqf +++ b/addons/watch/functions/fnc_showRWatch.sqf @@ -54,8 +54,6 @@ private _o2 = _display displayCtrl 22810; _pfhID call CBA_fnc_removePerFrameHandler; }; - _unit setVariable [QGVAR(rangerPFH), _pfhID, false]; - private _altitudeValue = round((getPosASL _unit) select 2); if (GVAR(altitudeUnit) == 1) then { From 623e15c3d64770585104679684111ad48a4e1b1c Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:53:28 -0800 Subject: [PATCH 3/8] ABG Fixes --- addons/circulation/CfgVehicles.hpp | 84 +++++++++++++++++-- .../functions/fnc_addArterialApplyActions.sqf | 12 ++- .../functions/fnc_addArterialTestActions.sqf | 1 + .../functions/fnc_attachBloodGas.sqf | 3 +- .../functions/fnc_showBloodGas.sqf | 2 +- 5 files changed, 89 insertions(+), 13 deletions(-) diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp index 932e1a86a..5ef4a7763 100644 --- a/addons/circulation/CfgVehicles.hpp +++ b/addons/circulation/CfgVehicles.hpp @@ -235,6 +235,15 @@ class CfgVehicles { class LandVehicle; class Car: LandVehicle { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -250,6 +259,15 @@ class CfgVehicles { class Car_F: Car {}; class Quadbike_01_base_F: Car_F { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { class KAT_ArterialTest { @@ -264,6 +282,15 @@ class CfgVehicles { }; class Kart_01_Base_F: Car_F { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { class KAT_ArterialTest { @@ -278,6 +305,15 @@ class CfgVehicles { }; class Tank: LandVehicle { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -292,6 +328,15 @@ class CfgVehicles { }; class Motorcycle: LandVehicle { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -307,6 +352,15 @@ class CfgVehicles { class Air; class Helicopter: Air { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -321,6 +375,15 @@ class CfgVehicles { }; class Plane: Air { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -336,6 +399,15 @@ class CfgVehicles { class Ship; class Ship_F: Ship { + class ACE_SelfActions { + class KAT_ArterialTest { + displayName = CSTRING(Arterial_Test_Action); + condition = QUOTE(_target call ACEFUNC(medical_treatment,isMedicalVehicle)); + statement = ""; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialTestActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; + }; class ACE_Actions { class ACE_MainActions { class KAT_ArterialTest { @@ -354,12 +426,12 @@ class CfgVehicles { class ACE_Actions { class ACE_MainActions { class KAT_ApplyBloodTest { - displayName = CSTRING(Arterial_Test); - condition = "true"; - statement = "true"; - insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialApplyActions)); - icon = QACEPATHTOF(medical_gui,ui\cross.paa); - }; + displayName = CSTRING(Arterial_Test); + condition = QUOTE(missionNamespace getVariable [ARR_2(QQGVAR(abgEnable),false)]); + statement = "true"; + insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialApplyActions)); + icon = QACEPATHTOF(medical_gui,ui\cross.paa); + }; }; class ACE_Head { class CheckBloodPressure {}; // Remove the ability to check blood pressure at the head diff --git a/addons/circulation/functions/fnc_addArterialApplyActions.sqf b/addons/circulation/functions/fnc_addArterialApplyActions.sqf index 2e469d019..e44a5b868 100644 --- a/addons/circulation/functions/fnc_addArterialApplyActions.sqf +++ b/addons/circulation/functions/fnc_addArterialApplyActions.sqf @@ -30,9 +30,13 @@ private _fnc_getActions = { if (_idNumber > 0) then { private _resultSampleMap = missionNamespace getVariable [QEGVAR(circulation,resultSampleMap), []]; - _resultSampleMap = _resultSampleMap get _idNumber; - _resultSampleMap = _resultSampleMap select 1; - private _patient = _resultSampleMap select 0; + _resultSampleArray = _resultSampleMap get _idNumber; + _resultSampleActual = _resultSampleArray select 1; + private _patient = _resultSampleArray select 0; + + diag_log _resultSampleArray; + diag_log _resultSampleActual; + diag_log _patient; _actions pushBack [ [ @@ -45,7 +49,7 @@ private _fnc_getActions = { [] ] call ACEFUNC(interact_menu,createAction), [], - [_resultSampleMap, _target, _idNumber, _player] + [_resultSampleActual, _target, _idNumber, _player] ]; }; } forEach ([_player, 0] call ACEFUNC(common,uniqueItems)); diff --git a/addons/circulation/functions/fnc_addArterialTestActions.sqf b/addons/circulation/functions/fnc_addArterialTestActions.sqf index 2631a67d9..8ebcde58e 100644 --- a/addons/circulation/functions/fnc_addArterialTestActions.sqf +++ b/addons/circulation/functions/fnc_addArterialTestActions.sqf @@ -27,6 +27,7 @@ private _fnc_getActions = { { private _config = _cfgWeapons >> _x; _idNumber = getNumber (_config >> "nameID"); + diag_log _idNumber; if (_idNumber > 0) then { private _bloodSampleArray = missionNamespace getVariable [QEGVAR(circulation,bloodSampleMap), []]; diff --git a/addons/circulation/functions/fnc_attachBloodGas.sqf b/addons/circulation/functions/fnc_attachBloodGas.sqf index cb974d473..8205f01be 100644 --- a/addons/circulation/functions/fnc_attachBloodGas.sqf +++ b/addons/circulation/functions/fnc_attachBloodGas.sqf @@ -16,8 +16,7 @@ */ params ["_entries"]; _entries params ["_bloodGas", "_patient", "_idNumber", "_player"]; -_bloodGas params ["_patientName", "_bloodGasArray"]; -_patient setVariable [QGVAR(testedBloodGas), _bloodGasArray, true]; +_patient setVariable [QGVAR(testedBloodGas), _bloodGas, true]; _player removeItem (format ["KAT_bloodResult_%1",_idNumber]); \ No newline at end of file diff --git a/addons/circulation/functions/fnc_showBloodGas.sqf b/addons/circulation/functions/fnc_showBloodGas.sqf index d683e904b..808636bdc 100644 --- a/addons/circulation/functions/fnc_showBloodGas.sqf +++ b/addons/circulation/functions/fnc_showBloodGas.sqf @@ -28,7 +28,7 @@ private _resultSampleMap = missionNamespace getVariable [QEGVAR(circulation,resu _resultCounter = [_resultCounter +1, 1] select (_resultCounter == 20); missionNamespace setVariable [QEGVAR(circulation,resultCounter), _resultCounter, true]; -_resultSampleMap set [_resultCounter, [name(_patient), _bloodGas]]; +_resultSampleMap set [_resultCounter, [_patientName, _bloodGasArray]]; missionNamespace setVariable [QEGVAR(circulation,resultSampleMap), _resultSampleMap, true]; private _itemStr = format ["KAT_bloodResult_%1", _resultCounter]; From 124dc3091c7217e2e0ce9a984657ead466e221d5 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:59:09 -0800 Subject: [PATCH 4/8] Update CfgVehicles.hpp --- addons/circulation/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp index 5ef4a7763..2caa43f7a 100644 --- a/addons/circulation/CfgVehicles.hpp +++ b/addons/circulation/CfgVehicles.hpp @@ -427,7 +427,7 @@ class CfgVehicles { class ACE_MainActions { class KAT_ApplyBloodTest { displayName = CSTRING(Arterial_Test); - condition = QUOTE(missionNamespace getVariable [ARR_2(QQGVAR(abgEnable),false)]); + condition = QUOTE(GVAR(abgEnable)); statement = "true"; insertChildren = QUOTE([ARR_2(_target,_player)] call FUNC(addArterialApplyActions)); icon = QACEPATHTOF(medical_gui,ui\cross.paa); From 9b43ae049cc2de6424144eb4084ce7a4193da961 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:59:23 -0800 Subject: [PATCH 5/8] Update fnc_showRWatch.sqf --- addons/watch/functions/fnc_showRWatch.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/watch/functions/fnc_showRWatch.sqf b/addons/watch/functions/fnc_showRWatch.sqf index 42fa41d8e..23b63216e 100644 --- a/addons/watch/functions/fnc_showRWatch.sqf +++ b/addons/watch/functions/fnc_showRWatch.sqf @@ -54,6 +54,8 @@ private _o2 = _display displayCtrl 22810; _pfhID call CBA_fnc_removePerFrameHandler; }; + _unit setVariable [QGVAR(rangerPFH), _pfhID, false]; + private _altitudeValue = round((getPosASL _unit) select 2); if (GVAR(altitudeUnit) == 1) then { From 370adf36a0e10202a1556f1a8735c368d407ecf9 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:00:02 -0800 Subject: [PATCH 6/8] Update fnc_showRWatch.sqf --- addons/watch/functions/fnc_showRWatch.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/watch/functions/fnc_showRWatch.sqf b/addons/watch/functions/fnc_showRWatch.sqf index 23b63216e..cb74c897f 100644 --- a/addons/watch/functions/fnc_showRWatch.sqf +++ b/addons/watch/functions/fnc_showRWatch.sqf @@ -54,8 +54,6 @@ private _o2 = _display displayCtrl 22810; _pfhID call CBA_fnc_removePerFrameHandler; }; - _unit setVariable [QGVAR(rangerPFH), _pfhID, false]; - private _altitudeValue = round((getPosASL _unit) select 2); if (GVAR(altitudeUnit) == 1) then { @@ -96,4 +94,4 @@ private _o2 = _display displayCtrl 22810; _altitude, _hr, _o2 -]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +]] call CBA_fnc_addPerFrameHandler; From 0436f1bc2e6915cbcf2734ce4b0ba3ec5eb62480 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:00:21 -0800 Subject: [PATCH 7/8] Update fnc_addArterialApplyActions.sqf --- .../circulation/functions/fnc_addArterialApplyActions.sqf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/circulation/functions/fnc_addArterialApplyActions.sqf b/addons/circulation/functions/fnc_addArterialApplyActions.sqf index e44a5b868..c75861697 100644 --- a/addons/circulation/functions/fnc_addArterialApplyActions.sqf +++ b/addons/circulation/functions/fnc_addArterialApplyActions.sqf @@ -34,10 +34,6 @@ private _fnc_getActions = { _resultSampleActual = _resultSampleArray select 1; private _patient = _resultSampleArray select 0; - diag_log _resultSampleArray; - diag_log _resultSampleActual; - diag_log _patient; - _actions pushBack [ [ _x, @@ -58,4 +54,4 @@ private _fnc_getActions = { }; -[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall); \ No newline at end of file +[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall); From 10bbb1c8289b6ba8fec6fbdd7671d71f69b38958 Mon Sep 17 00:00:00 2001 From: mazinskihenry <33608576+mazinskihenry@users.noreply.github.com> Date: Mon, 16 Dec 2024 20:00:38 -0800 Subject: [PATCH 8/8] Update fnc_addArterialTestActions.sqf --- addons/circulation/functions/fnc_addArterialTestActions.sqf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/circulation/functions/fnc_addArterialTestActions.sqf b/addons/circulation/functions/fnc_addArterialTestActions.sqf index 8ebcde58e..b73ce230b 100644 --- a/addons/circulation/functions/fnc_addArterialTestActions.sqf +++ b/addons/circulation/functions/fnc_addArterialTestActions.sqf @@ -27,7 +27,6 @@ private _fnc_getActions = { { private _config = _cfgWeapons >> _x; _idNumber = getNumber (_config >> "nameID"); - diag_log _idNumber; if (_idNumber > 0) then { private _bloodSampleArray = missionNamespace getVariable [QEGVAR(circulation,bloodSampleMap), []]; @@ -57,4 +56,4 @@ private _fnc_getActions = { }; -[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall); \ No newline at end of file +[[], _fnc_getActions, _player, QGVAR(actionsCache), 9999, "cba_events_loadoutEvent"] call ACEFUNC(common,cachedCall);