Update fn_isPlayerNear.sqf

10Dozen · Oct 1, 2016 · c5f2d32 · c5f2d32
1 parent 1cce5ae
commit c5f2d32
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/dzn_commonFunctions/functions/areaFunctions/fn_isPlayerNear.sqf b/dzn_commonFunctions/functions/areaFunctions/fn_isPlayerNear.sqf
@@ -10,13 +10,20 @@
 
 params["_pos", ["_dist", 1000], ["_mode", "bool"]];
 
+#define	BOOL_MODE	toLower(_mode) == "bool"
+#define	IS_NEAR	(getPosASL _x) distance _pos <= _dist
+
 _pos = if (typename (_this select 0) == "ARRAY") then { _this select 0 } else { getPosASL (_this select 0) };
+private _r = if (BOOL_MODE) then { false } else { objNull };
 
-private _r = if (toLower(_mode) == "bool") then { false } else { objNull };
-{
-	if ((getPosASL _x) distance _pos <= _dist) exitWith {
-		_r = if (toLower(_mode) == "bool") then { true } else { _x };
-	};
-} forEach (call BIS_fnc_listPlayers);
+if (BOOL_MODE) then {
+	_r = { IS_NEAR } count (call BIS_fnc_listPlayers) > 0;
+} else {
+	{
+		if ( IS_NEAR ) exitWith {
+			_r = _x;
+		};
+	} forEach (call BIS_fnc_listPlayers);
+};
 
 _r