move GVAR(points) from CBA hash to HashMap

Author: Fusselwurm

functions/points/fn_addPoints.sqf

@@ -13,10 +13,10 @@ if (_side isEqualTo sideUnknown) exitWith {
     false
 };
 
-private _sidePoints = [GVAR(points), _side] call CBA_fnc_hashGet;
-private _oldSidePointsForCategory = [_sidePoints, _category] call CBA_fnc_hashGet;
-[_sidePoints, _category, _oldSidePointsForCategory + _points] call CBA_fnc_hashSet;
-[GVAR(points), _side, _sidePoints] call CBA_fnc_hashSet; // returning the default value does *not* imply setting it - so we need to explicitly set this at least once.
+private _sidePoints = GVAR(points) getOrDefault [_side, createHashMap];
+private _oldSidePointsForCategory = _sidePoints getOrDefault [_category, 0];
+_sidePoints set [_category, _oldSidePointsForCategory + _points];
+GVAR(points) set [_side, _sidePoints]; // returning the default value does *not* imply setting it - so we need to explicitly set this at least once.
 
 publicVariable QGVAR(points);
 true

functions/points/fn_getPoints.sqf

@@ -4,9 +4,11 @@ params [
     ["_side", sideUnknown, [sideUnknown]]
 ];
 
-private _categorizedPoints = [[GVAR(points), _side] call CBA_fnc_hashGet] call CBA_fnc_hashValues;
+private _categorizedPoints = [
+    GVAR(points) getOrDefault [_side, createHashMap]
+] call CBA_fnc_hashValues;
 
 private _sum = 0;
-{ _sum = _sum + _x } forEach _categorizedPoints;
+{ _sum = _sum + _y } forEach _categorizedPoints;
 
 _sum

functions/points/fn_getPointsCategorized.sqf

@@ -5,9 +5,8 @@ params [
 ];
 
 private _pairs = [];
-[
-    [GVAR(points), _side] call CBA_fnc_hashGet,
-    { _pairs pushBack [_key, _value] }
-] call CBA_fnc_hashEachPair;
+{
+    _pairs pushBack [_x, _y];
+} forEach (GVAR(points) getOrDefault [_side, createHashMap]);
 
 _pairs

functions/points/fn_getPointsCategory.sqf

@@ -5,7 +5,4 @@ params [
     ["_category", "Other", [""]]
 ];
 
-[
-    [GVAR(points), _side] call CBA_fnc_hashGet,
-    _category
-] call CBA_fnc_hashGet
+(GVAR(points) getOrDefault [_side, createHashMap]) getOrDefault [_category, 0]

functions/points/fn_initPoints.sqf

@@ -26,6 +26,6 @@ ISNILS(GVAR(bounties), [ARR_2([], [ARR_2([], 0)] call CBA_fnc_hashCreate)] call
 ];
 
 // this is a map<side:SIDE,map<category:STRING,points:SCALAR>>
-ISNILS(GVAR(points), [ARR_2([], [ARR_2([], 0)] call CBA_fnc_hashCreate)] call CBA_fnc_hashCreate);
+ISNILS(GVAR(points), createHashMap);
 
 [] call grad_points_fnc_addKilledEH;

functions/points/fn_setPoints.sqf

@@ -11,10 +11,10 @@ if (_side isEqualTo sideUnknown) exitWith {
     false
 };
 
-private _sidePoints = [GVAR(points), _side] call CBA_fnc_hashGet;
-private _oldSidePointsForCategory = [_sidePoints, _category] call CBA_fnc_hashGet;
-[_sidePoints, _category, _points] call CBA_fnc_hashSet;
-[GVAR(points), _side, _sidePoints] call CBA_fnc_hashSet; // returning the default value does *not* imply setting it - so we need to explicitly set this at least once.
+private _sidePoints = GVAR(points) getOrDefault [_side, createHashMap];
+private _oldSidePointsForCategory = _sidePoints getOrDefault [_category, 0];
+_sidePoints set [_category, _points];
+GVAR(points) set [_side, _sidePoints]; // returning the default value does *not* imply setting it - so we need to explicitly set this at least once.
 
 publicVariable QGVAR(points);
 true