diff --git a/addons/common/functions/fnc_doGesture.sqf b/addons/common/functions/fnc_doGesture.sqf index cee117a85b..9805beffc7 100644 --- a/addons/common/functions/fnc_doGesture.sqf +++ b/addons/common/functions/fnc_doGesture.sqf @@ -16,9 +16,9 @@ */ #include "script_component.hpp" -params ["_unit", "_animation"]; -TRACE_4("params",_unit,_animation); +params ["_unit", "_animation", ["_priority", 0]]; +TRACE_3("params",_unit,_animation,_priority); -if (!GVAR(isReloading)) then { +if (!GVAR(isReloading) || {_priority > 0}) then { [QGVAR(playActionNow), [_unit, _animation], _unit] call CBA_fnc_targetEvent; }; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index bc3dfad795..34390cbe20 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -3,8 +3,7 @@ if (hasInterface) then { // Add keybinds - ["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon), - { + ["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Conditions: specific @@ -14,9 +13,7 @@ if (hasInterface) then { // Statement [ACE_player, currentMuzzle ACE_player, false] call FUNC(clearJam); true - }, - {false}, - [19, [true, false, false]], false] call CBA_fnc_addKeybind; //SHIFT + R Key + }, {false}, [19, [true, false, false]], false] call CBA_fnc_addKeybind; //SHIFT + R Key }; ["ace_settingsInitialized", { diff --git a/addons/overheating/functions/fnc_clearJam.sqf b/addons/overheating/functions/fnc_clearJam.sqf index 52fdee41a7..4dcdaa0caf 100644 --- a/addons/overheating/functions/fnc_clearJam.sqf +++ b/addons/overheating/functions/fnc_clearJam.sqf @@ -32,7 +32,7 @@ if (_weapon in _jammedWeapons) then { _clearJamAction = getText (configFile >> "CfgWeapons" >> _weapon >> "reloadAction"); }; - [_unit, _clearJamAction] call EFUNC(common,doGesture); + [_unit, _clearJamAction, 1] call EFUNC(common,doGesture); if (_weapon == primaryWeapon _unit) then { playSound QGVAR(fixing_rifle); } else { diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index b4579a96ee..7a5e17464c 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -4,8 +4,7 @@ if (!hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo), -{ +["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo), { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, ["isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Conditions: specific @@ -14,9 +13,7 @@ if (!hasInterface) exitWith {}; // Statement [ACE_player] call FUNC(checkAmmo); true -}, -{false}, -[19, [false, true, false]], false] call CBA_fnc_addKeybind; +}, {false}, [19, [false, true, false]], false] call CBA_fnc_addKeybind; [QGVAR(syncAmmo), { //To propagate the setAmmo change, do it on all clients diff --git a/addons/reload/functions/fnc_checkAmmo.sqf b/addons/reload/functions/fnc_checkAmmo.sqf index 8d2289ac8c..baa0754f80 100644 --- a/addons/reload/functions/fnc_checkAmmo.sqf +++ b/addons/reload/functions/fnc_checkAmmo.sqf @@ -31,7 +31,7 @@ if (count _this > 1) then { }; if (_unit == _target) then { - [_unit, "Gear"] call EFUNC(common,doGesture); + [_unit, "Gear", 1] call EFUNC(common,doGesture); }; [FUNC(displayAmmo), [_target], 1, 0.1] call CBA_fnc_waitAndExecute;