Merge pull request #371 from CBATeam/cba_fnc_players

make 'CBA_fnc_players' not return headless clients
CBATeam · Jun 8, 2016 · 15d2518 · 15d2518
2 parents c53e9a8 + e9872c5
commit 15d2518
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp
@@ -37,6 +37,7 @@ class CfgFunctions {
             F_FILEPATH(selectWeapon);
             F_FILEPATH(switchPlayer);
             F_FILEPATH(currentUnit);
+            F_FILEPATH(players);
         };
 
         class Vehicles {

diff --git a/addons/common/backwards_comp.sqf b/addons/common/backwards_comp.sqf
@@ -5,11 +5,6 @@ CBA_fnc_createCenter = {
     _side
 };
 
-CBA_fnc_players = {
-    WARNING('Deprecated function used: CBA_fnc_players (new: allPlayers)');
-    allPlayers
-};
-
 CBA_fnc_locked = {
     WARNING('Deprecated function used: CBA_fnc_locked (new: locked)');
     locked _this > 1

diff --git a/addons/common/fnc_players.sqf b/addons/common/fnc_players.sqf
@@ -0,0 +1,26 @@
+/* ----------------------------------------------------------------------------
+Function: CBA_fnc_players
+
+Description:
+    Reports all (human) player objects. Does not include headless client entities.
+
+    Unlike "BIS_fnc_listPlayers", this function will not report the game logics of headless clients.
+
+Parameters:
+    None
+
+Returns:
+    List of all player objects <ARRAY>
+
+Examples:
+    (begin example)
+        [] call CBA_fnc_players
+    (end)
+
+Author:
+    commy2
+---------------------------------------------------------------------------- */
+#include "script_component.hpp"
+SCRIPT(players);
+
+[allUnits + allDead, {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}}] call BIS_fnc_conditionalSelect