Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
johnb432 2023-12-23 10:50:56 +01:00
parent da210890ac
commit a4661f3280
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/csw/functions/fnc_reload_canLoadMagazine.sqf
View File

@ -10,7 +10,7 @@
* 3: Supplier <OBJECT> (default: objNull) * 3: Supplier <OBJECT> (default: objNull)
* *
* Return Value: * Return Value:
* [CanLoad <BOOL>, LoadedMag <STRING>, AmmoNeeded <NUMBER>, IsBeltLinking <BOOL>] <ARRAY> * [Can Load <BOOL>, Loaded Mag <STRING>, Ammo Needed <NUMBER>, Is Belt Linking <BOOL>] <ARRAY>
* *
* Example: * Example:
* [cursorObject, [0], "ACE_csw_100Rnd_127x99_mag_red", player] call ace_csw_fnc_reload_canLoadMagazine * [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"); private _maxMagazineAmmo = _desiredAmmo min getNumber (_cfgMagazines >> _xMag >> "count");
if (_xAmmo >= _maxMagazineAmmo) exitWith { 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; _ammoNeeded = _maxMagazineAmmo - _xAmmo;
_isBeltLinking = true; _isBeltLinking = true;

2
addons/csw/functions/fnc_reload_getLoadableMagazines.sqf
View File

@ -10,7 +10,7 @@
* *
* Return Value: * Return Value:
* Mags <ARRAY> * Mags <ARRAY>
* [Carry Magazine <STRING>, Turret Path <ARRAY>, Load Info <NUMBER>, Magazine Source <OBJECT>] * [Carry Magazine <STRING>, Turret Path <ARRAY>, Load Info <ARRAY>, Magazine Source <OBJECT>, Unit <OBJECT>, Magazine Ammo <NUMBER>]
* *
* Example: * Example:
* [cursorObject, player] call ace_csw_fnc_reload_getLoadableMagazines * [cursorObject, player] call ace_csw_fnc_reload_getLoadableMagazines

2
addons/csw/functions/fnc_reload_loadMagazine.sqf
View File

@ -39,7 +39,7 @@ private _onFinish = {
private _nearUnits = _vehicle nearEntities ["CAManBase", 5]; private _nearUnits = _vehicle nearEntities ["CAManBase", 5];
[QGVAR(clearNearbySourcesCache), [], _nearUnits] call CBA_fnc_targetEvent; [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; [QGVAR(addTurretMag), [_vehicle, _turret, _magSource, _carryMag, _ammo, _unit, _magSource]] call CBA_fnc_globalEvent;
}; };

1
addons/csw/functions/fnc_staticWeaponInit.sqf
View File

@ -68,7 +68,6 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then {
[_typeOf, 0, ["ACE_MainActions"], _disassembleAction] call EFUNC(interact_menu,addActionToClass); [_typeOf, 0, ["ACE_MainActions"], _disassembleAction] call EFUNC(interact_menu,addActionToClass);
}; };
private _ammoActionPath = []; private _ammoActionPath = [];
private _magazineLocation = getText (_configOf >> QUOTE(ADDON) >> "magazineLocation"); private _magazineLocation = getText (_configOf >> QUOTE(ADDON) >> "magazineLocation");
private _condition = { //IGNORE_PRIVATE_WARNING ["_target", "_player"]; private _condition = { //IGNORE_PRIVATE_WARNING ["_target", "_player"];