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

only use one waitUntilAndExecute at any time for reload mutex

Browse Source
This commit is contained in:
commy2 2016-07-08 15:12:47 +02:00
parent be17b72cad
commit c55c0d5666
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/common/XEH_postInit.sqf
View File

@ -413,8 +413,6 @@ GVAR(isReloading) = false;
private _weapon = currentWeapon ACE_player; private _weapon = currentWeapon ACE_player;
if (_weapon != "") then { if (_weapon != "") then {
GVAR(isReloading) = true;
private _gesture = getText (configfile >> "CfgWeapons" >> _weapon >> "reloadAction"); private _gesture = getText (configfile >> "CfgWeapons" >> _weapon >> "reloadAction");
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;
@ -427,9 +425,17 @@ GVAR(isReloading) = false;
}; };
TRACE_2("Reloading, blocking gestures",_weapon,_duration); TRACE_2("Reloading, blocking gestures",_weapon,_duration);
[{ GVAR(reloadingETA) = CBA_missionTime + _duration;
GVAR(isReloading) = false;
}, [], _duration] call CBA_fnc_waitAndExecute; if (!GVAR(isReloading)) then {
GVAR(isReloading) = true;
[{
CBA_missionTime > GVAR(reloadingETA)
},{
GVAR(isReloading) = false;
}] call CBA_fnc_waitUntilAndExecute;
};
}; };
}; };