General - Replace count with findIf (#11243)

PabstMirror · web-flow · commit ba28ec5a8c49 · 2026-01-17T16:32:13.000-06:00
diff --git a/addons/ai/functions/fnc_garrison.sqf b/addons/ai/functions/fnc_garrison.sqf
@@ -85,7 +85,7 @@ if (_topDownFilling) then {
 _buildingsIndex = _buildingsIndex apply {
     _x select {
         private _testedPos = _x;
-        ({(_x select 1) isEqualTo _testedPos} count (missionNamespace getVariable [QGVAR(garrison_unitMoveList), []])) == 0
+        (missionNamespace getVariable [QGVAR(garrison_unitMoveList), []]) findIf {(_x select 1) isEqualTo _testedPos} == -1
     }
 };
 
@@ -105,13 +105,13 @@ private _unitMoveList = [];
 
 private _fnc_comparePos = {
     params ["_nearestUnits", "_pos"];
-    ({
+    (_nearestUnits findIf {
         if (surfaceIsWater getPos _x) then {
             floor ((getPosASL _x) select 2) == floor ((AGLToASL _pos) select 2)
         } else {
             floor ((getPosATL _x) select 2) == floor (_pos select 2)
         };
-    } count _nearestUnits) > 0
+    }) != -1
 };
 
 // Do the placement
@@ -268,7 +268,7 @@ private _garrison_unitMoveList = missionNamespace getVariable [QGVAR(garrison_un
 
 _garrison_unitMoveList = _garrison_unitMoveList select {
     _x params ["_testedUnit", "_testedPos"];
-    ({(_x select 0) isEqualTo _testedUnit} count _unitMoveList == 0)
+    _unitMoveList findIf {(_x select 0) isEqualTo _testedUnit} == -1
 };
 
 _garrison_unitMoveList append _unitMoveList;
diff --git a/addons/ai/functions/fnc_garrisonMove.sqf b/addons/ai/functions/fnc_garrisonMove.sqf
@@ -77,7 +77,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then {
                     [QGVAR(AISection), [[_unit], ["PATH"], false], _unit] call CBA_fnc_targetEvent;
                     [QGVAR(AISection), [[_unit], ["FSM"], true], _unit] call CBA_fnc_targetEvent;
 
-                    if ({(_x select 0) in units _unit && {!isPlayer (_x select 0)}} count _unitMoveList == 0) then {
+                    if (_unitMoveList findIf {(_x select 0) in units _unit && {!isPlayer (_x select 0)}} == -1) then {
                         [QGVAR(enableAttack), [[_unit], true], _unit] call CBA_fnc_targetEvent;
                     };
 
diff --git a/addons/common/functions/fnc_displayIcon.sqf b/addons/common/functions/fnc_displayIcon.sqf
@@ -85,7 +85,7 @@ private _refresh = {
 };
 
 if (_show) then {
-    if ({_x select 0 == _iconId} count _list == 0) then {
+    if (_list findIf {_x select 0 == _iconId} == -1) then {
         _list pushBack [_iconId, _icon, _color, CBA_missionTime];
     } else {
         {
diff --git a/addons/dagr/functions/fnc_menuInit.sqf b/addons/dagr/functions/fnc_menuInit.sqf
@@ -523,7 +523,7 @@ GVAR(menuRun) = true;
                     (__dsp displayCtrl __mainText) ctrlSetText "Connecting...";
                 };
                 if (CBA_missionTime - GVAR(busyTimer) > 0.6) then {
-                    if (({_x isKindOf  ["ACE_Vector", configFile >> "CfgWeapons"]} count (weapons ACE_player)) > 0) then {
+                    if ((weapons ACE_player) findIf {_x isKindOf  ["ACE_Vector", configFile >> "CfgWeapons"]} != -1) then {
                         GVAR(displaySelection) = "VECTOR";
                         (__dsp displayCtrl __mainText) ctrlSetText "Vector Connected";
                         GVAR(vectorConnected) = true;
diff --git a/addons/fastroping/functions/fnc_canCutRopes.sqf b/addons/fastroping/functions/fnc_canCutRopes.sqf
@@ -19,4 +19,4 @@ params ["_vehicle"];
 private _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
 
 (_deployedRopes isNotEqualTo []) &&
-{{(_x select 5)} count (_deployedRopes) == 0}
+{_deployedRopes findIf {_x select 5} == -1}
diff --git a/addons/fastroping/functions/fnc_canFastRope.sqf b/addons/fastroping/functions/fnc_canFastRope.sqf
@@ -21,5 +21,5 @@ private _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
 
 ((driver _vehicle != _unit) &&
 {_deployedRopes isNotEqualTo []} &&
-{{!(_x select 5) && !(_x select 6)} count (_deployedRopes) > 0} &&
+{_deployedRopes findIf {!(_x select 5) && !(_x select 6)} != -1} &&
 {getPos _vehicle select 2 > 2})
diff --git a/addons/fastroping/functions/fnc_deployAI.sqf b/addons/fastroping/functions/fnc_deployAI.sqf
@@ -80,13 +80,13 @@ DFUNC(deployAIRecursive) = {
             [{
                 params ["_vehicle"];
                 private _deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
-                ({!(_x select 5)} count (_deployedRopes)) > 0
+                (_deployedRopes findIf {!(_x select 5)}) != -1
             }, FUNC(deployAIRecursive), _this] call CBA_fnc_waitUntilAndExecute;
         }, [_vehicle, _unitsToDeploy], 1] call CBA_fnc_waitAndExecute;
     } else {
         [{
             private _deployedRopes = _this getVariable [QGVAR(deployedRopes), []];
-            ({_x select 5} count (_deployedRopes)) == 0
+            _deployedRopes findIf {_x select 5} == -1
         }, {
             [_this] call FUNC(cutRopes);
             driver _this enableAI "MOVE";
diff --git a/addons/huntir/functions/fnc_huntir.sqf b/addons/huntir/functions/fnc_huntir.sqf
@@ -84,7 +84,7 @@ createDialog QGVAR(cam_dialog_off);
                             GVAR(state) = "noGDS";
                             [QGVAR(monitorNoGDS), [ACE_player]] call CBA_fnc_localEvent;
                         };
-                        if (_elapsedTime > 5 && {{_x getHitPointDamage "HitCamera" < 0.25} count _nearestHuntIRs > 0}) then {
+                        if (_elapsedTime > 5 && {_nearestHuntIRs findIf {_x getHitPointDamage "HitCamera" < 0.25} != -1}) then {
                             GVAR(state) = "connecting";
                             [QGVAR(monitorConnecting), [ACE_player]] call CBA_fnc_localEvent;
                         };
diff --git a/addons/map/functions/fnc_blueForceTrackingUpdate.sqf b/addons/map/functions/fnc_blueForceTrackingUpdate.sqf
@@ -33,9 +33,9 @@ if (GVAR(BFT_Enabled) and {(!isNil "ACE_player") and {alive ACE_player}}) then {
 
     if (GVAR(BFT_HideAiGroups)) then {
         _groupsToDrawMarkers = _groupsToDrawMarkers select {
-            {
+            (units _x) findIf {
                 _x call EFUNC(common,isPlayer);
-            } count units _x > 0;
+            } != -1;
         };
     };
 
@@ -55,9 +55,9 @@ if (GVAR(BFT_Enabled) and {(!isNil "ACE_player") and {alive ACE_player}}) then {
         } forEach _playersToDrawMarkers;
 
         _groupsToDrawMarkers = _groupsToDrawMarkers select {
-            {
+            (units _x) findIf {
                 !(_x call EFUNC(common,isPlayer));
-            } count units _x > 0;
+            } != -1;
         };
     };
 
diff --git a/addons/medical_feedback/XEH_postInit.sqf b/addons/medical_feedback/XEH_postInit.sqf
@@ -124,11 +124,11 @@ GVAR(bloodTickCounter) = 0;
 #ifdef DISABLE_VANILLA_DAMAGE_EFFECTS
 TRACE_1("disabling vanilla bleeding feedback effects",_this);
 [{
-    {isNil _x} count [
+    [
         "BIS_fnc_feedback_damageCC",
         "BIS_fnc_feedback_damageRadialBlur",
         "BIS_fnc_feedback_damageBlur"
-    ] == 0
+    ] findIf {isNil _x} == -1 
 }, {
     {
         ppEffectDestroy _x;
diff --git a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
@@ -92,7 +92,7 @@ TRACE_1("",_ambianceSounds);
 
             TRACE_1("",_newPosASL);
             // If no unit is to close to this position, we will play the sound.
-            if ({(_newPosASL distance _x < (_minimalDistance / 2))}count _allUnits == 0) then {
+            if (_allUnits findIf {_newPosASL distance _x < (_minimalDistance / 2)} == -1) then {
                 private _soundFile = selectRandom _ambianceSounds;
                 TRACE_2("playing file",_soundFile,_newPosASL);
                 playSound3D [_soundFile, objNull,  false, _newPosASL, _volume, 1, 1000];
diff --git a/addons/rearm/functions/fnc_canRearm.sqf b/addons/rearm/functions/fnc_canRearm.sqf
@@ -29,6 +29,6 @@ if (isNil "_magazineClass") exitWith {false};
 private _needRearmMags = [_vehicle] call FUNC(getNeedRearmMagazines);
 
 // Testing if vehicle needs rearm on any magazines of class _magazineClass
-private _needsRearm = ({(_x select 0) isEqualTo _magazineClass} count _needRearmMags) > 0;
+private _needsRearm = (_needRearmMags findIf {(_x select 0) isEqualTo _magazineClass}) != -1;
 
 _needsRearm
diff --git a/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf b/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf
@@ -83,7 +83,7 @@ private _turrets = [_vehicle] call FUNC(getAllRearmTurrets);
 
         /* If there is space for new magazines or if some magazines are not full, add the magazine
          * type to _magazineInfo. */
-        if ((_currentMagazines < _maxMagazines) || {({_x < _maxRoundsPerMag} count _currentRounds) > 0}) then {
+        if ((_currentMagazines < _maxMagazines) || {_currentRounds findIf {_x < _maxRoundsPerMag} != -1}) then {
             if (_magazineClass == "FakeWeapon") exitWith {};
             _magazineInfo pushBack [_magazineClass, _turretPath, false, -1, _maxMagazines, _currentMagazines, _maxRoundsPerMag, _currentRounds];
         };
diff --git a/addons/refuel/functions/fnc_makeSource.sqf b/addons/refuel/functions/fnc_makeSource.sqf
@@ -69,7 +69,7 @@ if (_fuelCargo == REFUEL_DISABLED_FUEL) exitWith {};
 if (
     !isNil "_hooks"
     && {_hooks isEqualTypeAll []}
-    && {0 == {!(_x isEqualTypeParams [0,0,0]) || {3 < count _x}} count _hooks}
+    && {_hooks findIf {!(_x isEqualTypeParams [0,0,0]) || {3 < count _x}} == -1}
 ) then {
     _source setVariable [QGVAR(hooks), _hooks, true];
 };
diff --git a/addons/repair/functions/fnc_hasItems.sqf b/addons/repair/functions/fnc_hasItems.sqf
@@ -21,7 +21,7 @@ TRACE_2("params",_unit,_items);
 
 private _return = true;
 {
-    if ((_x isEqualType []) && {({[_unit, _x] call EFUNC(common,hasItem)} count _x == 0)}) exitWith {
+    if ((_x isEqualType []) && {_x findIf {[_unit, _x] call EFUNC(common,hasItem)} == -1}) exitWith {
         _return = false;
     };
     if ((_x isEqualType "") && {!([_unit, _x] call EFUNC(common,hasItem))}) exitWith {
diff --git a/addons/zeus/functions/fnc_bi_moduleCurator.sqf b/addons/zeus/functions/fnc_bi_moduleCurator.sqf
@@ -127,7 +127,7 @@ if (_activated) then {
                     case (_ownerUID > 0): {
                         waitUntil {
                             sleep 0.01;
-                            {getPlayerUID _x == _ownerVar} count playableUnits > 0 || isNull _logic
+                            (playableUnits findIf {getPlayerUID _x == _ownerVar}) != -1 || isNull _logic
                         };
                     };
                     default {
@@ -189,7 +189,7 @@ if (_activated) then {
                     case (_ownerUID > 0): {
                         waitUntil {
                             sleep 0.01;
-                            {getPlayerUID _x == _ownerVar} count playableUnits == 0 || isNull _logic
+                            (playableUnits findIf {getPlayerUID _x == _ownerVar} == -1) || isNull _logic
                         };
                     };
                     default {
diff --git a/addons/zeus/functions/fnc_bi_moduleProjectile.sqf b/addons/zeus/functions/fnc_bi_moduleProjectile.sqf
@@ -28,7 +28,7 @@ _logic = _this select 0;
 _units = _this select 1;
 _activated = _this select 2;
 
-if ({local _x} count (objectCurators _logic) > 0) then {
+if ((objectCurators _logic) findIf {local _x} != -1) then {
     //--- Reveal the circle to curators
     _logic hideObject false;
     _logic setPos position _logic;

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private _refresh = {`
`85`	`85`	`};`
`86`	`86`
`87`	`87`	`if (_show) then {`
`88`		`- if ({_x select 0 == _iconId} count _list == 0) then {`
	`88`	`+ if (_list findIf {_x select 0 == _iconId} == -1) then {`
`89`	`89`	`_list pushBack [_iconId, _icon, _color, CBA_missionTime];`
`90`	`90`	`} else {`
`91`	`91`	`{`