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

Disposable - Fix magazines not being replaced by their disposable counterparts #1664

Merged
merged 2 commits into from
Jul 28, 2024
Merged

Disposable - Fix magazines not being replaced by their disposable counterparts #1664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da9c0c4
Update fnc_replaceMagazineCargo.sqf
johnb432 May 8, 2024
7e418de
Update fnc_replaceMagazineCargo.sqf
johnb432 May 8, 2024
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
4 changes: 3 additions & 1 deletion addons/disposable/fnc_replaceMagazineCargo.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ if (magazineCargo _box arrayIntersect GVAR(magazines) isEqualTo []) exitWith {};
private _magazines = magazinesAmmoCargo _box;
clearMagazineCargoGlobal _box;

private _isBackpack = getNumber (configOf _box >> "isBackpack") != -1;
private _isBackpack = getNumber (configOf _box >> "isBackpack") == 1;

{
_x params ["_magazine", "_ammo"];

if (_magazine in GVAR(magazines)) then {
private _loadedLauncher = GVAR(MagazineLaunchers) getVariable _magazine;

// As addWeaponCargoGlobal ignores allowedSlots, check here if launcher is allowed to be placed in a backpack
if (!_isBackpack || {_loadedLauncher in GVAR(BackpackLaunchers)}) then {
_box addWeaponCargoGlobal [_loadedLauncher, 1];
};
Expand Down