diff --git a/addons/ace_interact/XEH_postInitClient.sqf b/addons/ace_interact/XEH_postInitClient.sqf index 12872bf97..090ace094 100644 --- a/addons/ace_interact/XEH_postInitClient.sqf +++ b/addons/ace_interact/XEH_postInitClient.sqf @@ -10,6 +10,7 @@ if (!hasInterface) exitWith {}; ["ace_arsenal_displayClosed", { EGVAR(sys_core,arsenalOpen) = false; + [] call DFUNC(monitorRadiosHandler); }] call CBA_fnc_addEventHandler; ["ace_arsenal_rightPanelFilled", { diff --git a/addons/sys_core/fnc_arsenalClose.sqf b/addons/sys_core/fnc_arsenalClose.sqf index 4fb243e1a..e0f492de9 100644 --- a/addons/sys_core/fnc_arsenalClose.sqf +++ b/addons/sys_core/fnc_arsenalClose.sqf @@ -33,3 +33,5 @@ private _weapons = [acre_player] call EFUNC(sys_core,getGear); ACRE_ARSENAL_RADIOS = []; GVAR(arsenalRadios) = []; GVAR(arsenalOpen) = false; + +[] call EFUNC(sys_radio,monitorRadiosHandler); diff --git a/addons/sys_gui/fnc_inventoryListMouseUp.sqf b/addons/sys_gui/fnc_inventoryListMouseUp.sqf index 2cc4fa8c8..60367b479 100644 --- a/addons/sys_gui/fnc_inventoryListMouseUp.sqf +++ b/addons/sys_gui/fnc_inventoryListMouseUp.sqf @@ -23,4 +23,5 @@ params ["", "_button"]; if (_button == 1) then { LOG("inventoryListMouseUp"); ACRE_HOLD_OFF_ITEMRADIO_CHECK = false; + [] call EFUNC(sys_radio,monitorRadiosHandler); }; diff --git a/addons/sys_radio/XEH_PREP.hpp b/addons/sys_radio/XEH_PREP.hpp index 5ee762dd5..d981abb6b 100644 --- a/addons/sys_radio/XEH_PREP.hpp +++ b/addons/sys_radio/XEH_PREP.hpp @@ -1,5 +1,5 @@ PREP(monitorRadios); -PREP(monitorRadiosPFH); +PREP(monitorRadiosHandler); PREP(setActiveRadio); PREP(openRadio); diff --git a/addons/sys_radio/fnc_monitorRadios.sqf b/addons/sys_radio/fnc_monitorRadios.sqf index da1baac6c..f67c7bfe1 100644 --- a/addons/sys_radio/fnc_monitorRadios.sqf +++ b/addons/sys_radio/fnc_monitorRadios.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" /* * Author: ACRE2Team - * Sets up the per frame event handler for monitoring the local player inventory for changes. + * Sets up the CBA loadout event handler for monitoring the local player inventory for changes. * * Arguments: * None @@ -27,4 +27,5 @@ LOG("Monitor Inventory Starting"); {time >= 1} }, { [DFUNC(monitorRadiosPFH), 0.25, []] call CBA_fnc_addPerFrameHandler; + ["loadout", DFUNC(monitorRadiosHandler), true] call CBA_fnc_addPlayerEventHandler; }, []] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/sys_radio/fnc_monitorRadiosPFH.sqf b/addons/sys_radio/fnc_monitorRadiosHandler.sqf similarity index 98% rename from addons/sys_radio/fnc_monitorRadiosPFH.sqf rename to addons/sys_radio/fnc_monitorRadiosHandler.sqf index 274535558..d5fca98c5 100644 --- a/addons/sys_radio/fnc_monitorRadiosPFH.sqf +++ b/addons/sys_radio/fnc_monitorRadiosHandler.sqf @@ -10,7 +10,7 @@ * None * * Example: - * [] call acre_sys_radio_fnc_monitorRadiosPFH + * [] call acre_sys_radio_fnc_monitorRadiosHandler * * Public: No */