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

QuickMount - fix locked seats, getIn EH (#5626)

Browse Source
This commit is contained in:
PabstMirror 2017-10-15 10:59:34 -05:00 committed by jonpas
parent d598906205
commit 6e219b8678
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/quickmount/functions/fnc_getInNearest.sqf
View File

@ -63,6 +63,12 @@ if (!isNull _target &&
if ((_effectiveRole in ["driver", "gunner"]) && {unitIsUAV _target}) exitWith {}; // Ignoring UAV Driver/Gunner
if ((_effectiveRole == "driver") && {(getNumber (([_target] call CBA_fnc_getObjectConfig) >> "hasDriver")) == 0}) exitWith {}; // Ignoring Non Driver (static weapons)
// Seats can be locked independently of the main vehicle
if ((_role == "driver") && {lockedDriver _target}) exitWith {TRACE_1("lockedDriver",_x);};
if ((_cargoIndex >= 0) && {_target lockedCargo _cargoIndex}) exitWith {TRACE_1("lockedCargo",_x);};
if ((!(_turretPath isEqualTo [])) && {_target lockedTurret _turretPath}) exitWith {TRACE_1("lockedTurret",_x);};
if (_effectiveRole == "turret") then {
if ((getNumber (([_target, _turretPath] call CBA_fnc_getTurret) >> "isCopilot")) == 1) exitWith {
_effectiveRole = "driver";
@ -75,12 +81,18 @@ if (!isNull _target &&
TRACE_2("",_effectiveRole,_x);
if (_effectiveRole != _desiredRole) exitWith {};
if (_role == "Turret") then {
ACE_player action ["GetIn" + _role, _target, _turretPath];
TRACE_3("Geting In",_x,_role,_turretPath);
if (!(_turretPath isEqualTo [])) then {
// Using GetInTurret seems to solve problems with incorrect GetInEH params when gunner/commander
ACE_player action ["GetInTurret", _target, _turretPath];
TRACE_3("Geting In Turret",_x,_role,_turretPath);
} else {
ACE_player action ["GetIn" + _role, _target];
TRACE_3("Geting In",_x,_role);
if (_cargoIndex > -1) then {
ACE_player action ["GetInCargo", _target, _cargoIndex];
TRACE_3("Geting In Cargo",_x,_role,_cargoIndex);
} else {
ACE_player action ["GetIn" + _role, _target];
TRACE_2("Geting In",_x,_role);
};
};
_hasAction = true;