feat(arsenal): Use API function for saving loadout

Additionally fixes the issue with restocking
WitchFreya · Jan 26, 2025 · fadabd5 · fadabd5
1 parent ffb624d
commit fadabd5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 48 deletions.
diff --git a/addons/arsenal/XEH_PREP.inc.sqf b/addons/arsenal/XEH_PREP.inc.sqf
@@ -5,4 +5,3 @@ PREP(onClickMigrate);
 PREP(onLoadoutsDisplayOpened);
 PREP(onLoadoutsListFilled);
 PREP(onSelChangedLoadouts);
-PREP(saveLoadoutWithName);
diff --git a/addons/arsenal/XEH_postInit.sqf b/addons/arsenal/XEH_postInit.sqf
@@ -6,8 +6,8 @@
   };
   private _target = currentNamespace getVariable ["ace_arsenal_center", player];
   private _isValidTarget = local _target && {_target isEqualTo player};
-  if (_isValidTarget) exitWith {
+  if !(_isValidTarget) exitWith {
     TRACE_1("Invalid loadout save target",_target);
   };
-  [GVAR(lastLoadoutName), player call CBA_fnc_getLoadout] call FUNC(saveLoadoutWithName);
+  [GVAR(lastLoadoutName), player call CBA_fnc_getLoadout, true] call ace_arsenal_fnc_saveLoadout;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/arsenal/functions/fnc_confirmMigrate.sqf b/addons/arsenal/functions/fnc_confirmMigrate.sqf
@@ -95,11 +95,11 @@ private _fnc_migrate = {
 };
 
 // backup the original
-[format ["%1 (Backup)", _loadoutName], _extendedLoadout] call FUNC(saveLoadoutWithName);
+[format ["%1 (Backup)", _loadoutName], _extendedLoadout, true] call ace_arsenal_fnc_saveLoadout;
 
 // save the new
 private _mut_newLoadout = [_loadout] call _fnc_migrate;
-[_loadoutName, [_mut_newLoadout, _cbaExtended]] call FUNC(saveLoadoutWithName);
+[_loadoutName, [_mut_newLoadout, _cbaExtended], true] call ace_arsenal_fnc_saveLoadout;
 
 // remove the cached data
 private _contentPanelCtrl = _display displayCtrl IDC_contentPanel;

diff --git a/addons/arsenal/functions/fnc_saveLoadoutWithName.sqf b/addons/arsenal/functions/fnc_saveLoadoutWithName.sqf