possible fix for #1358

CBATeam · Oct 14, 2020 · 937e9b2 · 937e9b2
1 parent 79c04b6
commit 937e9b2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/addons/hashes/fnc_hashCreate.sqf b/addons/hashes/fnc_hashCreate.sqf
@@ -9,6 +9,7 @@ Description:
 Parameters:
     _array - Array of key-value pairs to create Hash from [Array, defaults to []]
     _defaultValue - Default value. Used when key doesn't exist. A key is also removed from the hash if the value is set to this default [Any, defaults to nil]
+    _clearOnDefault - Setting default value behaves like a remove
 
 Returns:
     Newly created Hash [Hash]
@@ -31,10 +32,10 @@ Author:
 SCRIPT(hashCreate);
 
 // -----------------------------------------------------------------------------
-params [["_array", [], [[]]], "_defaultValue"];
+params [["_array", [], [[]]], "_defaultValue", ["_clearOnDefault", true]];
 
 private _keys = _array apply {_x select 0};
 private _values = _array apply {_x select 1};
 
 // Return.
-[TYPE_HASH, _keys, _values, if (isNil "_defaultValue") then {nil} else {_defaultValue}];
+[TYPE_HASH, _keys, _values, if (isNil "_defaultValue") then {nil} else {_defaultValue}, _clearOnDefault];
diff --git a/addons/hashes/fnc_hashSet.sqf b/addons/hashes/fnc_hashSet.sqf
@@ -35,7 +35,7 @@ private _default = _hash select HASH_DEFAULT_VALUE;
 if (isNil "_default") then {
     _isDefault = isNil "_value";
 } else {
-    if (!isNil "_value") then {
+    if (!isNil "_value" && {_hash param [HASH_CLEARONDEFAULT, true]}) then {
         _isDefault = _value isEqualTo _default;
     };
 };

diff --git a/addons/hashes/fnc_isHash.sqf b/addons/hashes/fnc_isHash.sqf
@@ -23,4 +23,4 @@ SCRIPT(isHash);
 // -----------------------------------------------------------------------------
 params ["_hash"];
 
-_hash isEqualType [] && {count _hash == 4} && {(_hash select HASH_ID) isEqualTo TYPE_HASH}
+_hash isEqualType [] && {count _hash == 5} && {(_hash select HASH_ID) isEqualTo TYPE_HASH}
diff --git a/addons/hashes/script_hashes.hpp b/addons/hashes/script_hashes.hpp
@@ -2,5 +2,6 @@
 #define HASH_KEYS 1
 #define HASH_VALUES 2
 #define HASH_DEFAULT_VALUE 3
+#define HASH_CLEARONDEFAULT 4
 
 #define TYPE_HASH "#CBA_HASH#"