Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Common - Improve CBA_fnc_addItem, Fix CBA_fnc_addMagazine return #1562

Merged
merged 2 commits into from
Jun 24, 2023
Merged

Common - Improve CBA_fnc_addItem, Fix CBA_fnc_addMagazine return #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6452c31
Attempt to add item to vehicle if unit in vehicle
Drofseh Nov 24, 2022
5926554
fix return for addMagazine and addItem
Drofseh Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions addons/common/fnc_addItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Description:
Parameters:
_unit - the unit <OBJECT>
_item - name of the weapon to add <STRING>
_verify - if true, then put item on the ground if it can't be added <BOOLEAN>
_verify - if true, then put item in vehicle or on the ground if it can't be added <BOOLEAN>

Returns:
true on success, false otherwise <BOOLEAN>
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions addons/common/fnc_addMagazine.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Parameters:
_unit - the unit or vehicle <OBJECT>
_item - name of the magazine to add <STRING>
_ammo - ammo count <NUMBER>
_verify - if true, then put item on the ground if it can't be added <BOOLEAN>
_verify - if true, then put item in vehicle or on the ground if it can't be added <BOOLEAN>
Returns:
true on success, false otherwise <BOOLEAN>
Expand Down Expand Up @@ -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 {
Expand Down