diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index f3a58646a7..4c8ffd8b3a 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -20,6 +20,6 @@ if(!GVAR(keyDown)) then { GVAR(keyDown) = true; GVAR(keyDownTime) = diag_tickTime; - ["interact_keyDown", []] call EFUNC(common,localEvent); + ["interactMenuOpened", [0]] call EFUNC(common,localEvent); }; true diff --git a/addons/interact_menu/functions/fnc_keyDownSelfAction.sqf b/addons/interact_menu/functions/fnc_keyDownSelfAction.sqf index 0f58a246d2..63c81b58bc 100644 --- a/addons/interact_menu/functions/fnc_keyDownSelfAction.sqf +++ b/addons/interact_menu/functions/fnc_keyDownSelfAction.sqf @@ -17,6 +17,8 @@ if(!GVAR(keyDownSelfAction)) then { GVAR(keyDown) = false; GVAR(keyDownTime) = diag_tickTime; + ["interactMenuOpened", [1]] call EFUNC(common,localEvent); + GVAR(useCursorMenu) = (vehicle ACE_player != ACE_player) || GVAR(AlwaysUseCursorSelfInteraction) || visibleMap; if (GVAR(useCursorMenu)) then { diff --git a/addons/logistics_wirecutter/XEH_clientInit.sqf b/addons/logistics_wirecutter/XEH_clientInit.sqf index 4d82dce0a8..c46cab29f1 100644 --- a/addons/logistics_wirecutter/XEH_clientInit.sqf +++ b/addons/logistics_wirecutter/XEH_clientInit.sqf @@ -2,4 +2,4 @@ if (!hasInterface) exitWith {}; -["interact_keyDown", {_this call FUNC(interactEH)}] call EFUNC(common,addEventHandler); +["interactMenuOpened", {_this call FUNC(interactEH)}] call EFUNC(common,addEventHandler); diff --git a/addons/logistics_wirecutter/functions/fnc_interactEH.sqf b/addons/logistics_wirecutter/functions/fnc_interactEH.sqf index c2a721adeb..c81fc46c40 100644 --- a/addons/logistics_wirecutter/functions/fnc_interactEH.sqf +++ b/addons/logistics_wirecutter/functions/fnc_interactEH.sqf @@ -3,24 +3,28 @@ * When interact_menu starts rendering (from "interact_keyDown" event) * * Arguments: - * Nothing + * Interact Menu Type (0 - world, 1 - self) * * Return Value: * Nothing * * Example: - * [] call ace_logistics_wirecutter_fnc_interactEH + * [0] call ace_logistics_wirecutter_fnc_interactEH * * Public: Yes */ #include "script_component.hpp" +PARAMS_1(_interactionType); + +if (_interactionType != 0) exitWith {}; //for performance only do stuff it they have a wirecutter item //(if they somehow get one durring keydown they'll just have to reopen) if (!("ACE_wirecutter" in (items ace_player))) exitWith {}; [{ + private ["_fncStatement", "_attachedFence", "_fncCondition", "_helper"]; PARAMS_2(_args,_pfID); EXPLODE_3_PVT(_args,_setPosition,_addedHelpers,_fencesHelped);