1
0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

Fix reload mutex with binocs or mounted

Fix 
This commit is contained in:
PabstMirror 2016-07-11 21:53:02 -05:00 committed by commy2
parent 8a4514f8e7
commit a0aea441b4

View File

@ -410,10 +410,13 @@ GVAR(isReloading) = false;
["keyDown", { ["keyDown", {
if ((_this select 1) in actionKeys "ReloadMagazine" && {alive ACE_player}) then { if ((_this select 1) in actionKeys "ReloadMagazine" && {alive ACE_player}) then {
//Ignore mounted (except ffv)
if (!(player call CBA_fnc_canUseWeapon)) exitWith {};
private _weapon = currentWeapon ACE_player; private _weapon = currentWeapon ACE_player;
if (_weapon != "") then { if (_weapon != "") then {
private _gesture = getText (configfile >> "CfgWeapons" >> _weapon >> "reloadAction"); private _gesture = getText (configfile >> "CfgWeapons" >> _weapon >> "reloadAction");
if (_gesture == "") exitWith {}; //Ignore weapons with no reload gesture (binoculars)
private _isLauncher = _weapon isKindOf ["Launcher", configFile >> "CfgWeapons"]; private _isLauncher = _weapon isKindOf ["Launcher", configFile >> "CfgWeapons"];
private _config = ["CfgGesturesMale", "CfgMovesMaleSdr"] select _isLauncher; private _config = ["CfgGesturesMale", "CfgMovesMaleSdr"] select _isLauncher;
private _duration = getNumber (configfile >> _config >> "States" >> _gesture >> "speed"); private _duration = getNumber (configfile >> _config >> "States" >> _gesture >> "speed");