Merge pull request #212 from commy2/findNilNullImprovements

Support configNull and teamMemberNull in CBA_fnc_findNull, use params in CBA_fnc_findNil
CBATeam · Dec 11, 2015 · b3ec002 · b3ec002
2 parents 437cd89 + 6c23e02
commit b3ec002
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/addons/arrays/fnc_findNil.sqf b/addons/arrays/fnc_findNil.sqf
@@ -9,7 +9,7 @@ Parameters:
 
 Example:
     (begin example)
-    _index = ["", Player, "test", nil, VARIABLE, nil] call CBA_fnc_findNil
+    _index = ["", player, "test", nil, _variable, nil] call CBA_fnc_findNil
     (end)
 
 Returns:
@@ -20,14 +20,14 @@ Author:
 ---------------------------------------------------------------------------- */
 #include "script_component.hpp"
 
-if !(IS_ARRAY(_this)) exitWith {-1};
+[_this] params [["_array", [], [[]]]];
 
 scopeName "main";
 
 {
     if (isNil "_x") then {
         _forEachIndex breakOut "main";
     };
-} forEach _this;
+} forEach _array;
 
 -1
diff --git a/addons/arrays/fnc_findNull.sqf b/addons/arrays/fnc_findNull.sqf
@@ -9,7 +9,7 @@ Parameters:
 
 Example:
     (begin example)
-    _index = ["", Player, "test", objNull, VARIABLE] call CBA_fnc_findNull
+    _index = ["", player, "test", objNull, _variable] call CBA_fnc_findNull
     (end)
 
 Returns:
@@ -20,18 +20,16 @@ Author:
 ---------------------------------------------------------------------------- */
 #include "script_component.hpp"
 
-if !(IS_ARRAY(_this)) exitWith {-1};
+[_this] params [["_array", [], [[]]]];
 
 scopeName "main";
 
-private "_checkableTypes";
-
-_checkableTypes = ["OBJECT", "CONTROL", "DISPLAY", "GROUP", "LOCATION", "TASK", "SCRIPT"];
+private _nullTypes = [objNull, controlNull, displayNull, grpNull, teamMemberNull, locationNull, taskNull, scriptNull, configNull];
 
 {
-    if (typeName _x in _checkableTypes && {isNull _x}) then {
+    if (_x in _nullTypes) then {
         _forEachIndex breakOut "main";
     };
-} forEach _this;
+} forEach _array;
 
 -1
diff --git a/addons/arrays/test_findNil.sqf b/addons/arrays/test_findNil.sqf
@@ -6,6 +6,7 @@ SCRIPT(test_findNil);
 
 // ----------------------------------------------------------------------------
 
+disableSerialization;
 private ["_expected", "_result", "_fn"];
 
 _fn = "CBA_fnc_findNil";

diff --git a/addons/arrays/test_findNull.sqf b/addons/arrays/test_findNull.sqf
@@ -6,6 +6,7 @@ SCRIPT(test_findNull);
 
 // ----------------------------------------------------------------------------
 
+disableSerialization;
 private ["_original", "_expected", "_result", "_fn"];
 
 _fn = "CBA_fnc_findNull";

diff --git a/addons/arrays/test_findTypeName.sqf b/addons/arrays/test_findTypeName.sqf
@@ -6,6 +6,7 @@ SCRIPT(test_findTypeName);
 
 // ----------------------------------------------------------------------------
 
+disableSerialization;
 private ["_array", "_expected", "_result", "_fn"];
 
 _fn = "CBA_fnc_findTypeName";