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 - Fix addToInventory for magazines #9823

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Common - Fix addToInventory for magazines #9823

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions addons/common/functions/fnc_addToInventory.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ switch (_type select 0) do {

switch (_container) do {
case "vest": {
_unit addItemToVest _classname; //@todo Bug! A full magazine, ignoring ammo. No such command.
(vestContainer _unit) addMagazineAmmoCargo [_classname, 1, _ammoCount];
};
case "backpack": {
_unit addItemToBackpack _classname; //@todo Bug! A full magazine, ignoring ammo. No such command.
(backpackContainer _unit) addMagazineAmmoCargo [_classname, 1, _ammoCount];
};
case "uniform": {
_unit addItemToUniform _classname; //@todo Bug! A full magazine, ignoring ammo. No such command.
(uniformContainer _unit) addMagazineAmmoCargo [_classname, 1, _ammoCount];
};
default {
_unit addMagazine [_classname, _ammoCount];
Expand All @@ -130,7 +130,7 @@ switch (_type select 0) do {
private _pos = _unit modelToWorldVisual [0,1,0.05];

_unit = createVehicle ["WeaponHolder_Single_F", _pos, [], 0, "NONE"];
johnb432 marked this conversation as resolved.
Show resolved Hide resolved
_unit addMagazineCargoGlobal [_classname, 1/*_ammoCount*/]; //@todo Bug! This isn't really the ammo, but magazine count. No such command.
_unit addMagazineAmmoCargo [_classname, 1, _ammoCount];
_unit setPosATL _pos;
};
};
Expand Down