From dae2c5b465c12e4c320e7ef117e0b899fd3373c2 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Wed, 3 Jul 2024 17:39:04 +0200
Subject: [PATCH] Common - Clean up `ace_common_fnc_hasItem` &
 `ace_common_fnc_hasMagazine` functions (#10108)

* Clean up hasItem & hasMagazine functions

* Replace EFUNC

* Update fnc_hasItem.sqf
---
 addons/common/functions/fnc_hasItem.sqf     | 10 +++++-----
 addons/common/functions/fnc_hasMagazine.sqf | 12 +++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/common/functions/fnc_hasItem.sqf b/addons/common/functions/fnc_hasItem.sqf
index f446c5dac0..ac0be8b10e 100644
--- a/addons/common/functions/fnc_hasItem.sqf
+++ b/addons/common/functions/fnc_hasItem.sqf
@@ -1,21 +1,21 @@
 #include "..\script_component.hpp"
 /*
  * Author: Glowbal
- * Check if unit has item. Note: case-sensitive.
+ * Check if given unit has an item of given classname. Note: Case sensitive.
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Item Classname <STRING>
+ * 1: Item classname <STRING>
  *
  * Return Value:
- * Unit has Item <BOOL>
+ * Unit has item <BOOL>
  *
  * Example:
- * [bob, "item"] call ace_common_fnc_hasItem
+ * [player, "ACE_Banana"] call ace_common_fnc_hasItem
  *
  * Public: Yes
  */
 
 params [["_unit", objNull, [objNull]], ["_item", "", [""]]];
 
-_item in (_unit call EFUNC(common,uniqueItems))
+_item in (_unit call FUNC(uniqueItems)) // return
diff --git a/addons/common/functions/fnc_hasMagazine.sqf b/addons/common/functions/fnc_hasMagazine.sqf
index 7874bcbd16..9f35aafdba 100644
--- a/addons/common/functions/fnc_hasMagazine.sqf
+++ b/addons/common/functions/fnc_hasMagazine.sqf
@@ -1,23 +1,21 @@
 #include "..\script_component.hpp"
 /*
  * Author: Glowbal
- * Check if given unit has a magazine of given classname
+ * Check if given unit has a magazine of given classname. Note: Case sensitive.
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Magazine Classname <STRING>
+ * 1: Magazine classname <STRING>
  *
  * Return Value:
- * has Magazine <BOOL>
+ * Unit has magazine <BOOL>
  *
  * Example:
- * [bob, "magazine"] call ace_common_fnc_hasMagazine
+ * [player, "30Rnd_65x39_caseless_mag"] call ace_common_fnc_hasMagazine
  *
  * Public: yes
- *
- * Note: Case sensitive
  */
 
 params [["_unit", objNull, [objNull]], ["_magazine", "", [""]]];
 
-_magazine in magazines _unit // return
+_magazine in ([_unit, 2] call FUNC(uniqueItems)) // return