Merge pull request #1262 from CBATeam/update-dropWeapon

update CBA_fnc_dropWeapon
CBATeam · Dec 3, 2019 · c4daf20 · c4daf20
2 parents 939c70e + 28498a4
commit c4daf20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/addons/common/fnc_dropWeapon.sqf b/addons/common/fnc_dropWeapon.sqf
@@ -3,7 +3,7 @@
 Function: CBA_fnc_dropWeapon
 
 Description:
-    Drops a weapon.
+    Drops a weapon (including binocular).
 
     Function which verifies existence of _item and _unit, returns false in case
     of trouble, or when able to remove _item from _unit true in case of success
@@ -21,32 +21,23 @@ Examples:
     (end)
 
 Author:
-    ?, commy2
+    commy2
 ---------------------------------------------------------------------------- */
 SCRIPT(dropWeapon);
 
 params [["_unit", objNull, [objNull]], ["_item", "", [""]]];
 
-private _weaponInfo = (weaponsItems _unit select {_x select 0 == _item}) param [0, []];
-private _return = [_unit, _item] call CBA_fnc_removeWeapon;
-
-if (_return) then {
-    private _baseWeapon = _item call CBA_fnc_weaponComponents param [0, _item];
-
-    private _items = _weaponInfo;
-    _items deleteAt 0; // delete the weapon
-
-    private _magazines = [];
+private _weaponInfo = [];
 
-    {
-        if (_x isEqualType []) then {
-            _magazines pushBack _x;
-            _items set [_forEachIndex, ""];
-        };
-    } forEach _items;
+{
+    if (_x param [0, ""] == _item) exitWith {
+        _weaponInfo = _x;
+    };
+} forEach weaponsItems _unit;
 
-    _items = _items - [""];
+private _return = [_unit, _item] call CBA_fnc_removeWeapon;
 
+if (_return) then {
     _unit switchMove "ainvpknlmstpslaywrfldnon_1";
 
     private _weaponHolder = nearestObject [_unit, "WeaponHolder"];
@@ -56,15 +47,7 @@ if (_return) then {
         _weaponHolder setPosASL getPosASL _unit;
     };
 
-    _weaponHolder addWeaponCargoGlobal [_baseWeapon, 1];
-
-    {
-        _weaponHolder addItemCargoGlobal [_x, 1];
-    } forEach _items;
-
-    {
-        _weaponHolder addMagazineAmmoCargo [_x select 0, 1, _x select 1];
-    } forEach _magazines;
+    _weaponHolder addWeaponWithAttachmentsCargoGlobal [_weaponInfo, 1];
 };
 
 _return
diff --git a/addons/common/fnc_removeWeapon.sqf b/addons/common/fnc_removeWeapon.sqf
@@ -3,7 +3,7 @@
 Function: CBA_fnc_removeWeapon
 
 Description:
-    Remove a weapon.
+    Remove a weapon (including binocular).
 
     Function which verifies existence of _item and _unit, returns false in case
     of trouble, or when able to remove _item from _unit true in case of success.