From a4661f3280606fa0fa8b33e18fa8449fe6d73be3 Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 23 Dec 2023 10:50:56 +0100 Subject: [PATCH] Minor cleanup --- addons/csw/functions/fnc_reload_canLoadMagazine.sqf | 4 ++-- addons/csw/functions/fnc_reload_getLoadableMagazines.sqf | 2 +- addons/csw/functions/fnc_reload_loadMagazine.sqf | 2 +- addons/csw/functions/fnc_staticWeaponInit.sqf | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/csw/functions/fnc_reload_canLoadMagazine.sqf b/addons/csw/functions/fnc_reload_canLoadMagazine.sqf index 39424d4860..5272673600 100644 --- a/addons/csw/functions/fnc_reload_canLoadMagazine.sqf +++ b/addons/csw/functions/fnc_reload_canLoadMagazine.sqf @@ -10,7 +10,7 @@ * 3: Supplier (default: objNull) * * Return Value: - * [CanLoad , LoadedMag , AmmoNeeded , IsBeltLinking ] + * [Can Load , Loaded Mag , Ammo Needed , Is Belt Linking ] * * Example: * [cursorObject, [0], "ACE_csw_100Rnd_127x99_mag_red", player] call ace_csw_fnc_reload_canLoadMagazine @@ -63,7 +63,7 @@ private _isBeltLinking = false; }; private _maxMagazineAmmo = _desiredAmmo min getNumber (_cfgMagazines >> _xMag >> "count"); if (_xAmmo >= _maxMagazineAmmo) exitWith { - [false, _loadedMag, -6, false] breakOut "main"; // Already at capicity + [false, _loadedMag, -6, false] breakOut "main"; // Already at capacity }; _ammoNeeded = _maxMagazineAmmo - _xAmmo; _isBeltLinking = true; diff --git a/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf b/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf index 77c6d1bf77..c43e8f7da7 100644 --- a/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf +++ b/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf @@ -10,7 +10,7 @@ * * Return Value: * Mags - * [Carry Magazine , Turret Path , Load Info , Magazine Source ] + * [Carry Magazine , Turret Path , Load Info , Magazine Source , Unit , Magazine Ammo ] * * Example: * [cursorObject, player] call ace_csw_fnc_reload_getLoadableMagazines diff --git a/addons/csw/functions/fnc_reload_loadMagazine.sqf b/addons/csw/functions/fnc_reload_loadMagazine.sqf index d1667f63d5..9639e7e3d0 100644 --- a/addons/csw/functions/fnc_reload_loadMagazine.sqf +++ b/addons/csw/functions/fnc_reload_loadMagazine.sqf @@ -39,7 +39,7 @@ private _onFinish = { private _nearUnits = _vehicle nearEntities ["CAManBase", 5]; [QGVAR(clearNearbySourcesCache), [], _nearUnits] call CBA_fnc_targetEvent; - TRACE_6("calling addTurretMag event",_vehicle,_turret,_magSource,_carryMag,_ammo, _unit); + TRACE_6("calling addTurretMag event",_vehicle,_turret,_magSource,_carryMag,_ammo,_unit); [QGVAR(addTurretMag), [_vehicle, _turret, _magSource, _carryMag, _ammo, _unit, _magSource]] call CBA_fnc_globalEvent; }; diff --git a/addons/csw/functions/fnc_staticWeaponInit.sqf b/addons/csw/functions/fnc_staticWeaponInit.sqf index 43b43078d8..a5f20d6218 100644 --- a/addons/csw/functions/fnc_staticWeaponInit.sqf +++ b/addons/csw/functions/fnc_staticWeaponInit.sqf @@ -68,7 +68,6 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then { [_typeOf, 0, ["ACE_MainActions"], _disassembleAction] call EFUNC(interact_menu,addActionToClass); }; - private _ammoActionPath = []; private _magazineLocation = getText (_configOf >> QUOTE(ADDON) >> "magazineLocation"); private _condition = { //IGNORE_PRIVATE_WARNING ["_target", "_player"];