Cleanup Merge

This commit is contained in:
PabstMirror 2016-02-22 15:03:40 -06:00
parent 6dc0d7d4f5
commit 37eb353edf
2 changed files with 2 additions and 1 deletions

View File

@ -1,4 +1,5 @@
PREP(canUnjam);
PREP(checkTemperature);
PREP(clearJam);
PREP(displayTemperature);

View File

@ -19,7 +19,7 @@ private _jammedWeapons = _unit getVariable [QGVAR(jammedWeapons), []];
if !(currentWeapon _unit in _jammedWeapons) exitWith {
false
};
if !([_unit] call EFUNC(common,canUseWeapon)) exitWith {
if !([_unit] call CBA_fnc_canUseWeapon) exitWith {
false
};
true