Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interaction - Make magazine passing animation optional (#9875)

Browse Source 
* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update fnc_passMagazine.sqf

* Update addons/interaction/functions/fnc_passMagazine.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
This commit is contained in:
ZluskeN 2024-03-26 13:50:04 +01:00 committed by GitHub
parent 31217ae5d0
commit 5ca81b7ef3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/interaction/functions/fnc_passMagazine.sqf
View File

@ -7,6 +7,7 @@
* 0: Unit that passes the magazine <OBJECT>
* 1: Unit to pass the magazine to <OBJECT>
* 2: Weapon classname <STRING>
* 3: Play passing animation <BOOL> (default: true)
*
* Return Value:
* None
@ -16,7 +17,7 @@
*
* Public: No
*/
params ["_player", "_target", "_weapon"];
params ["_player", "_target", "_weapon", ["_animate", true, [true]]];
private _compatibleMags = [_weapon] call CBA_fnc_compatibleMagazines;
private _filteredMags = magazinesAmmoFull _player select {
@ -35,18 +36,12 @@ private _magToPassIndex = 0;
};
} foreach _filteredMags;
//remove all magazines and add them again, except the one to be passed
//needed because of missing commands, see http://feedback.arma3.com/view.php?id=12782
//remove the magazine from _player and add it to _target
_magToPass params ["_magToPassClassName", "_magToPassAmmoCount"];
_player removeMagazines _magToPassClassName;
{
_x params ["_className", "_ammoCount"];
if ((_className == _magToPassClassName) && (_forEachIndex != _magToPassIndex)) then {
_player addMagazine [_className, _ammoCount];
};
} foreach _filteredMags;
// Exit if failed to remove specific magazine
if !([_player, _magToPassClassName, _magToPassAmmoCount] call EFUNC(common,removeSpecificMagazine)) exitWith {};
[_player, "PutDown"] call EFUNC(common,doGesture);
if (_animate) then {[_player, "PutDown"] call EFUNC(common,doGesture)};
_target addMagazine [_magToPassClassName, _magToPassAmmoCount];