From fe3aaf2d5bdf105e13a58acfe13d01c278601964 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 5 Jun 2016 00:42:28 +0200 Subject: [PATCH 1/3] make 'CBA_fnc_players' not return headless clients --- addons/common/CfgFunctions.hpp | 1 + addons/common/backwards_comp.sqf | 5 ----- addons/common/fnc_players.sqf | 24 ++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 addons/common/fnc_players.sqf diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index d37741af2..24cd658bd 100644 --- 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 index 99bf8c346..1ea069aa6 100644 --- 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 new file mode 100644 index 000000000..d1db6c8c0 --- /dev/null +++ b/addons/common/fnc_players.sqf @@ -0,0 +1,24 @@ +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_players + +Description: + Reports all (human) player objects. Does not include headless client entities. + +Parameters: + None + +Returns: + List of all player objects + +Examples: + (begin example) + [] call CBA_fnc_players + (end) + +Author: + commy2 +---------------------------------------------------------------------------- */ +#include "script_component.hpp" +SCRIPT(players); + +(allUnits + allDead) select {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}} From af0ca9c0e3215618cf3dfd6de472984ae88cf1fb Mon Sep 17 00:00:00 2001 From: commy2 Date: Sun, 5 Jun 2016 18:21:31 +0200 Subject: [PATCH 2/3] make it 1.54 compatible --- addons/common/fnc_players.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/fnc_players.sqf b/addons/common/fnc_players.sqf index d1db6c8c0..69a248d4c 100644 --- a/addons/common/fnc_players.sqf +++ b/addons/common/fnc_players.sqf @@ -21,4 +21,4 @@ Author: #include "script_component.hpp" SCRIPT(players); -(allUnits + allDead) select {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}} +[allUnits + allDead, {isPlayer _x && {!(_x isKindOf "HeadlessClient_F")}}] call BIS_fnc_conditionalSelect From e9872c5aa58b1c3c4257a9d73b7948cd63afe318 Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 8 Jun 2016 02:19:33 +0200 Subject: [PATCH 3/3] add note about headless clients --- addons/common/fnc_players.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/common/fnc_players.sqf b/addons/common/fnc_players.sqf index 69a248d4c..a00b2d9d1 100644 --- a/addons/common/fnc_players.sqf +++ b/addons/common/fnc_players.sqf @@ -4,6 +4,8 @@ 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