diff --git a/addons/common/fnc_addItem.sqf b/addons/common/fnc_addItem.sqf index 2b2abf75d..c8fb456e3 100644 --- a/addons/common/fnc_addItem.sqf +++ b/addons/common/fnc_addItem.sqf @@ -11,7 +11,7 @@ Description: Parameters: _unit - the unit _item - name of the weapon to add - _verify - if true, then put item on the ground if it can't be added + _verify - if true, then put item in vehicle or on the ground if it can't be added Returns: true on success, false otherwise @@ -52,16 +52,21 @@ if (_verify) then { _unit addItem _item; _return = true; } else { - _unit switchMove "ainvpknlmstpslaywrfldnon_1"; + private _vehicle = vehicle _unit; + if (_vehicle isEqualTo _unit) then { + _unit switchMove "ainvpknlmstpslaywrfldnon_1"; - private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; + private _weaponHolder = nearestObject [_unit, "WeaponHolder"]; - if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { - _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; - _weaponHolder setPosASL getPosASL _unit; - }; + if (isNull _weaponHolder || {_unit distance _weaponHolder > 2}) then { + _weaponHolder = createVehicle ["GroundWeaponHolder", [0,0,0], [], 0, "NONE"]; + _weaponHolder setPosASL getPosASL _unit; + }; - [_weaponHolder, _item] call CBA_fnc_addItemCargo; + [_weaponHolder, _item, 1, _verify] call CBA_fnc_addItemCargo; + } else { + [_vehicle, _item, 1, _verify] call CBA_fnc_addItemCargo; + }; }; } else { _unit addItem _item; diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf index e5771669e..b7341769b 100644 --- a/addons/common/fnc_addMagazine.sqf +++ b/addons/common/fnc_addMagazine.sqf @@ -12,7 +12,7 @@ Parameters: _unit - the unit or vehicle _item - name of the magazine to add _ammo - ammo count - _verify - if true, then put item on the ground if it can't be added + _verify - if true, then put item in vehicle or on the ground if it can't be added Returns: true on success, false otherwise @@ -69,9 +69,9 @@ if (_verify) then { _weaponHolder setPosASL getPosASL _unit; }; - _return = [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + [_weaponHolder, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; } else { - _return = [_vehicle, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; + [_vehicle, _item, 1, _verify, _ammo] call CBA_fnc_addMagazineCargo; }; }; } else {