diff --git a/addons/csw/functions/fnc_getLoadActions.sqf b/addons/csw/functions/fnc_getLoadActions.sqf index 1b23b65c97..e5b448cec8 100644 --- a/addons/csw/functions/fnc_getLoadActions.sqf +++ b/addons/csw/functions/fnc_getLoadActions.sqf @@ -32,8 +32,7 @@ private _condition = { params ["_target", "_player", "_args"]; _args params ["_carryMag", "_turretPath", "", "_magSource"]; - [_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew) && - {([_target, _turretPath, _carryMag, _magSource] call FUNC(reload_canLoadMagazine)) select 0} + ([_target, _turretPath, _carryMag, _magSource] call FUNC(reload_canLoadMagazine)) select 0 }; private _cfgMagazines = configFile >> "CfgMagazines"; // Micro-optimization diff --git a/addons/csw/functions/fnc_getUnloadActions.sqf b/addons/csw/functions/fnc_getUnloadActions.sqf index a99b7f00a7..2aa0f7df11 100644 --- a/addons/csw/functions/fnc_getUnloadActions.sqf +++ b/addons/csw/functions/fnc_getUnloadActions.sqf @@ -43,8 +43,7 @@ private _condition = { params ["_target", "_player", "_args"]; _args params ["_vehMag", "_turretPath", "_carryMag"]; - [_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew) && - {[_target, _turretPath, _player, _carryMag, _vehMag] call FUNC(reload_canUnloadMagazine)} + [_target, _turretPath, _player, _carryMag, _vehMag] call FUNC(reload_canUnloadMagazine) }; private _actions = []; diff --git a/addons/interaction/functions/fnc_canInteractWithVehicleCrew.sqf b/addons/interaction/functions/fnc_canInteractWithVehicleCrew.sqf index 723882cce2..a314a8b601 100644 --- a/addons/interaction/functions/fnc_canInteractWithVehicleCrew.sqf +++ b/addons/interaction/functions/fnc_canInteractWithVehicleCrew.sqf @@ -11,7 +11,7 @@ * Unit can interact with vehicle crew * * Example: - * [player, cursorObject] call ace_interaction_fnc_canInteractWithVehicleCrew + * [cursorObject, player] call ace_interaction_fnc_canInteractWithVehicleCrew * * Public: No */ diff --git a/addons/reload/functions/fnc_canCheckAmmo.sqf b/addons/reload/functions/fnc_canCheckAmmo.sqf index 9d4fb9a1d2..ca91955562 100644 --- a/addons/reload/functions/fnc_canCheckAmmo.sqf +++ b/addons/reload/functions/fnc_canCheckAmmo.sqf @@ -11,17 +11,17 @@ * Can check ammo * * Example: - * [cursorObject, player] call ace_reload_fnc_canCheckAmmo + * [cursorObject] call ace_reload_fnc_canCheckAmmo * * Public: No */ -params ["_target", "_player"]; +params ["_target"]; // Static weapons if (_target isKindOf "StaticWeapon") exitWith { // No check ammo action on destroyed static weapons - if (!alive _target || {!([_player, _target] call EFUNC(interaction,canInteractWithVehicleCrew))}) exitWith {false}; + if (!alive _target) exitWith {false}; if (currentMagazine _target != "") exitWith {true};