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 rearm fixes (#5572)

Browse Source
This commit is contained in:
PabstMirror 2017-09-30 11:14:41 -05:00 committed by GitHub
parent 45a66ccfa1
commit 5f8350d7bc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/rearm/functions/fnc_getHardpointMagazines.sqf
View File

@ -15,6 +15,8 @@
*/
#include "script_component.hpp"
ACE_DEPRECATED(QFUNC(getHardpointMagazines),"3.12.0","getCompatiblePylonMagazines");
params ["_pylonConfig"];
private _return = GVAR(hardpointGroupsCache) getVariable (str _pylonConfig);

9
addons/rearm/functions/fnc_getNeedRearmMagazines.sqf
View File

@ -47,12 +47,9 @@ private _pylonConfigs = configProperties [configFile >> "CfgVehicles" >> (typeOf
private _currentRounds = _vehicle ammoOnPylon _pylonIndex;
if (_currentRounds < _maxRounds) then {
private _pylonTurret = getArray (_pylonConfig >> "turret");
// Converting to expected array for driver.
if (_pylonTurret isEqualTo []) then {_pylonTurret = [-1];};
// getPylonTurret expects 0 based index, and returns driver turret as [-1]
private _pylonTurret = [_vehicle, (_pylonIndex - 1)] call EFUNC(common,getPylonTurret);
_magazineInfo pushBack [_pylonMagazine, _pylonTurret, true, _pylonIndex, 1, 1, _maxRounds, [_currentRounds]];
};
};

2
addons/rearm/functions/fnc_readSupplyCounter.sqf
View File

@ -31,7 +31,7 @@ if (GVAR(supply) == 1) then {
if (_supplyCount > 0 ) then {
[[LSTRING(Hint_RemainingSupplyPoints), _supplyCount], 2, _unit] call EFUNC(common,displayTextStructured);
} else {
[LSTRING(Hint_EmptySupplyPoints), 2, _unit] call EFUNC(common,displayTextStructured);
[LSTRING(Hint_Empty), 2, _unit] call EFUNC(common,displayTextStructured);
};
true
},