Lock object while loading to cargo + disable disassembling (#5624)

This commit is contained in:
Dystopian 2017-11-29 23:07:30 +03:00 committed by PabstMirror
parent 64384280d0
commit fc8a70872f
2 changed files with 14 additions and 3 deletions

View File

@ -35,13 +35,17 @@ if (isNull _vehicle) exitWith {
private _return = false;
// Start progress bar
if ([_object, _vehicle] call FUNC(canLoadItemIn)) then {
[_player, _object, true] call EFUNC(common,claim);
private _size = [_object] call FUNC(getSizeItem);
[
5 * _size,
[_object,_vehicle],
{["ace_loadCargo", _this select 0] call CBA_fnc_localEvent},
{},
[_object, _vehicle],
{
[objNull, _this select 0 select 0, true] call EFUNC(common,claim);
["ace_loadCargo", _this select 0] call CBA_fnc_localEvent;
},
{[objNull, _this select 0 select 0, true] call EFUNC(common,claim)},
localize LSTRING(LoadingItem),
{true},
["isNotSwimming"]

View File

@ -30,10 +30,17 @@ _target setVariable [QGVAR(owner), _unit, true];
// lock target object
if (_lockTarget) then {
private _canBeDisassembled = !([] isEqualTo getArray (_target call CBA_fnc_getObjectConfig >> "assembleInfo" >> "dissasembleTo"));
if (!isNull _unit) then {
[QGVAR(lockVehicle), _target, _target] call CBA_fnc_targetEvent;
if (_canBeDisassembled) then {
_target enableWeaponDisassembly false;
};
} else {
[QGVAR(unlockVehicle), _target, _target] call CBA_fnc_targetEvent;
if (_canBeDisassembled) then {
_target enableWeaponDisassembly true;
};
};
};