Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add priority parameter to doGesture

Browse Source
This commit is contained in:
commy2 2016-07-13 11:00:31 +02:00
parent 404d5b49b4
commit cc76ac482a
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/common/functions/fnc_doGesture.sqf
View File

@ -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;
};

7
addons/overheating/XEH_postInit.sqf
View File

@ -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", {

2
addons/overheating/functions/fnc_clearJam.sqf
View File

@ -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 {

7
addons/reload/XEH_postInit.sqf
View File

@ -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

2
addons/reload/functions/fnc_checkAmmo.sqf
View File

@ -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;