Add EH for UAV control, Add Hellfire support

addons/common/XEH_postInit.sqf

@@ -317,6 +317,49 @@ GVAR(OldIsCamera) = false;
     END_COUNTER(stateChecker);
 }, 0.5, []] call CBA_fnc_addPerFrameHandler;
 
+// Add event handler for UAV control change
+ACE_controlledUAV = [objnull, objnull, [], ""];
+addMissionEventHandler ["PlayerViewChanged", {
+    // On non-server client this command is semi-broken
+    // arg index 5 should be the controlled UAV, but it will often be objNull (delay from locality switching?)
+    // On PlayerViewChanged event, start polling for new uav state for a few seconds (should be done within a few frames)
+
+    params ["", "", "", "", "_newCameraOn", "_UAV"];
+    TRACE_2("PlayerViewChanged",_newCameraOn,_UAV);
+
+    [{
+        if (isNull player) exitWith {true};
+        private _UAV = getConnectedUAV player;
+        if (!alive player) then {_UAV = objNull;};
+        private _position = (UAVControl _UAV) param [1, ""];
+        private _seatAI = objnull;
+        private _turret = [];
+        switch (toLower _position) do {
+            case (""): {
+                _UAV = objNull; // set to objNull if not actively controlling
+            };
+            case ("driver"): {
+                _turret = [-1];
+                _seatAI = driver _UAV;
+            };
+            case ("gunner"): {
+                _turret = [0];
+                _seatAI = gunner _UAV;
+            };
+        };
+
+        private _newArray = [_UAV, _seatAI, _turret, _position];
+        if (_newArray isEqualTo ACE_controlledUAV) exitWith {false}; // no change yet
+
+        TRACE_2("Seat Change",_newArray,ACE_controlledUAV);
+        ACE_controlledUAV = _newArray;
+        ["ACE_controlledUAV", _newArray] call CBA_fnc_localEvent;
+
+        // stay in the loop as we might switch from gunner -> driver, and there may be a empty position event in-between
+        false
+    }, {}, [], 3, {TRACE_1("timeout",_this);}] call CBA_fnc_waitUntilAndExecute;
+}];
+
 
 //////////////////////////////////////////////////
 // Eventhandlers for player controlled machines

addons/hellfire/XEH_postInit.sqf

@@ -7,4 +7,13 @@ GVAR(pfID) = -1;
 ["ace_settingsInitialized", {
     ["turret", LINKFUNC(showHud), false] call CBA_fnc_addPlayerEventHandler;
     ["vehicle", LINKFUNC(showHud), true] call CBA_fnc_addPlayerEventHandler; // only one of these needs the retro flag
+
+    // Add UAV Control Compatibility
+    ["ACE_controlledUAV", {
+        params ["_UAV", "_seatAI", "_turret", "_position"];
+        TRACE_4("ACE_controlledUAV EH",_UAV,_seatAI,_turret,_position);
+        if (!isNull _seatAI) then {
+            [_seatAI] call FUNC(showHud);
+        };
+    }] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;

addons/laser/functions/fnc_keyLaserCodeChange.sqf

@@ -24,12 +24,18 @@ if ((!alive ACE_player) || {!([ACE_player, vehicle ACE_player, []] call EFUNC(co
 private _currentShooter = objNull;
 private _currentWeapon = "";
 
-if (ACE_player call CBA_fnc_canUseWeapon) then {
-    _currentShooter = ACE_player;
-    _currentWeapon = currentWeapon ACE_player;
+if (isNull (ACE_controlledUAV param [0, objNull])) then {
+    if (ACE_player call CBA_fnc_canUseWeapon) then {
+        _currentShooter = ACE_player;
+        _currentWeapon = currentWeapon ACE_player;
+    } else {
+        _currentShooter = vehicle ACE_player;
+        private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
+        _currentWeapon = _currentShooter currentWeaponTurret _turretPath;
+    };
 } else {
-    _currentShooter = vehicle ACE_player;
-    private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
+    _currentShooter = ACE_controlledUAV select 0;
+    private _turretPath = ACE_controlledUAV select 2;
     _currentWeapon = _currentShooter currentWeaponTurret _turretPath;
 };
 

addons/missileguidance/functions/fnc_cycleAttackProfileKeyDown.sqf

@@ -24,14 +24,21 @@ if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))
 
 
 private ["_currentShooter", "_currentMagazine"];
-if (((vehicle ACE_player) == ACE_player) || {ACE_player call CBA_fnc_canUseWeapon}) then {
-    _currentShooter = ACE_player;
-    _currentMagazine = currentMagazine ACE_player;
+if (isNull (ACE_controlledUAV param [0, objNull])) then {
+    if (((vehicle ACE_player) == ACE_player) || {ACE_player call CBA_fnc_canUseWeapon}) then {
+        _currentShooter = ACE_player;
+        _currentMagazine = currentMagazine ACE_player;
+    } else {
+        _currentShooter = vehicle ACE_player;
+        private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
+        _currentMagazine = _currentShooter currentMagazineTurret _turretPath;
+    };
 } else {
-    _currentShooter = vehicle ACE_player;
-    private _turretPath = if (ACE_player == (driver _currentShooter)) then {[-1]} else {ACE_player call CBA_fnc_turretPath};
+    _currentShooter = ACE_controlledUAV select 0;
+    private _turretPath = ACE_controlledUAV select 2;
     _currentMagazine = _currentShooter currentMagazineTurret _turretPath;
 };
+
 if (_currentMagazine == "") exitWith {TRACE_1("no magazine",_currentMagazine)};
 
 private _ammo = getText (configFile >> "CfgMagazines" >> _currentMagazine >> "ammo");