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

Convert CBA_fnc_uniqueUnitItems to common fnc_uniqueItems (#6593)

Browse Source
This commit is contained in:
mharis001 2018-09-22 22:59:16 -04:00 committed by PabstMirror
parent 8648ccaba5
commit 0fd1a4c39e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/explosives/functions/fnc_interactEH.sqf
View File

@ -25,7 +25,7 @@ TRACE_1("Explosives interactEH",_interactionType);
if (
_interactionType != 0
|| {vehicle ACE_player != ACE_player}
|| {!("ACE_DefusalKit" in ([ACE_player, false, true, true, true, false] call CBA_fnc_uniqueUnitItems))}
|| {!("ACE_DefusalKit" in (ACE_player call EFUNC(common,uniqueItems)))}
) exitWith {};
[{
@ -38,7 +38,7 @@ if (
{deleteVehicle _x} forEach _addedHelpers;
[_pfhID] call CBA_fnc_removePerFrameHandler;
} else {
// Prevent Rare Error when ending mission with interact key down:
// Prevent Rare Error when ending mission with interact key down
private _player = ACE_player;
if (isNull _player) exitWith {};
private _playerPos = getPosASL _player;

2
addons/logistics_wirecutter/script_component.hpp
View File

@ -58,7 +58,7 @@
#define CUT_TIME_ENGINEER 7.5
#define HAS_WIRECUTTER(unit) (\
"ACE_wirecutter" in ([ARR_6(unit, false, true, true, true, false)] call CBA_fnc_uniqueUnitItems) \
"ACE_wirecutter" in (unit call EFUNC(common,uniqueItems)) \
|| {1 == getNumber (configFile >> "CfgVehicles" >> (backpack unit) >> QGVAR(hasWirecutter))} \
|| {1 == getNumber (configFile >> "CfgWeapons" >> (vest unit) >> QGVAR(hasWirecutter))} \
)