use Native Hashmaps where possible

TaktiCool · Apr 19, 2024 · 0617c14 · 0617c14
1 parent 62110ed
commit 0617c14
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/addons/Streamator/Spectator/Menu/fn_addMenuItem.sqf b/addons/Streamator/Spectator/Menu/fn_addMenuItem.sqf
@@ -21,16 +21,16 @@
 */
 params ["_name", "_path", ["_dik", DIK_F1], ["_onUse", {LOG("Nothing here.")}, [{}, ""]], ["_onRender", {true}, [{}]], ["_hasSubMenus", false], ["_args", []]];
 if (isNil QGVAR(menuEntries)) then {
-    GVAR(menuEntries) = false call CFUNC(createNamespace);
-    GVAR(menuEntries) setVariable ["MAIN", []];
+    GVAR(menuEntries) = createHashMap;
+    GVAR(menuEntries) set ["MAIN", []];
 };
 
-private _entry = GVAR(menuEntries) getVariable [_path, []];
+private _entry = GVAR(menuEntries) get [_path, []];
 
 if ((_entry findIf {(_x select 0) == _dik}) != -1) exitWith {
     ["Menu Item %1/%2 reused Keybinding %3", _path, _name, call compile (keyName _dik)] call BIS_fnc_error;
     [_name, _path, _dik + 1, _onUse, _onRender, _hasSubMenus, _args] call FUNC(addMenuItem);
 };
 _entry pushBack [_dik, _name, _onUse, _onRender, _hasSubMenus, _args];
 _entry sort true;
-GVAR(menuEntries) setVariable [_path, _entry];
+GVAR(menuEntries) set [_path, _entry];
diff --git a/addons/Streamator/Spectator/Menu/fn_executeEntry.sqf b/addons/Streamator/Spectator/Menu/fn_executeEntry.sqf
@@ -14,7 +14,7 @@
 
 */
 params ["_path", "_keyCode"];
-private _entries = GVAR(menuEntries) getVariable [_path, []];
+private _entries = GVAR(menuEntries) get [_path, []];
 {
     _x params ["_dik", "", "_onUse", "_onRender", "", "_args"];
     if (_dik == _keyCode) then {

diff --git a/addons/Streamator/Spectator/Menu/fn_renderMenu.sqf b/addons/Streamator/Spectator/Menu/fn_renderMenu.sqf
@@ -17,7 +17,7 @@ params [["_path", "", [""]], ["_mainPrefixText", ""]];
 if (_path isEqualTo "") then {
     "MAIN" call FUNC(renderMenu);
 };
-private _entry = GVAR(menuEntries) getVariable [_path, []];
+private _entry = GVAR(menuEntries) get [_path, []];
 if (_entry isEqualTo []) exitWith {
     "MAIN" call FUNC(renderMenu);
 };

diff --git a/addons/Streamator/Spectator/fn_openSpectator.sqf b/addons/Streamator/Spectator/fn_openSpectator.sqf
@@ -33,7 +33,7 @@ if (isNil QGVAR(SideColorsString)) then {
 };
 
 if (isNil QGVAR(PositionMemory)) then {
-    GVAR(PositionMemory) = false call CFUNC(createNamespace);
+    GVAR(PositionMemory) = createHashMap;
 };
 
 if (GVAR(aceMapGesturesLoaded)) then {

diff --git a/addons/Streamator/Spectator/fn_restorePosition.sqf b/addons/Streamator/Spectator/fn_restorePosition.sqf
@@ -15,7 +15,7 @@
 */
 params ["_slot", "_smoothTranslation"];
 
-private _element = GVAR(PositionMemory) getVariable (str _slot);
+private _element = GVAR(PositionMemory) get (str _slot);
 if (isNil "_element") exitWith {};
 
 if (count _element != 12) exitWith {};

diff --git a/addons/Streamator/Spectator/fn_savePosition.sqf b/addons/Streamator/Spectator/fn_savePosition.sqf
@@ -29,4 +29,4 @@ private _element = [
     GVAR(ShoulderOffset),
     GVAR(TopDownOffset)
 ];
-GVAR(PositionMemory) setVariable [str _slot, _element];
+GVAR(PositionMemory) set [str _slot, _element];