Skip to content

Commit cb74759

Browse files
authored
Merge pull request #1669 from LinkIsGrim/player-events-new-unit-getters
Events - Update player event loop to use new UAV AI getter
2 parents d0d45e0 + 35f4a92 commit cb74759

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

addons/events/fnc_playerEvent.sqf

+1-14
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,14 @@ SCRIPT(playerEvent);
2424
private _unit = missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player];
2525
private _vehicle = vehicle _unit;
2626

27-
private _controlledEntity = _unit;
28-
if (!isNull getConnectedUAV _unit) then {
29-
private _uavControl = UAVControl getConnectedUAV _unit;
30-
_uavControl = _uavControl param [(_uavControl find _unit) + 1, ""]; // Will be position STRING if actively controlling, or OBJECT if not.
31-
if (_uavControl isEqualTo "DRIVER") exitWith {
32-
_controlledEntity = driver getConnectedUAV _unit;
33-
};
34-
35-
if (_uavControl isEqualTo "GUNNER") exitWith {
36-
_controlledEntity = gunner getConnectedUAV _unit;
37-
};
38-
};
39-
4027
// Unlike CBA_fnc_turretPath, this will return [-1] when player is driver
4128
private _turret = _vehicle unitTurret _unit;
4229

4330
private _state = [
4431
_unit, group _unit, leader _unit,
4532
currentWeapon _unit, currentMuzzle _unit, currentWeaponMode _unit,
4633
getUnitLoadout _unit, _vehicle, _turret, _vehicle currentWeaponTurret _turret,
47-
currentVisionMode _controlledEntity, cameraView
34+
currentVisionMode focusOn, cameraView
4835
];
4936

5037
if (_state isNotEqualTo GVAR(oldState)) then {

addons/main/script_mod.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
1111

1212
// MINIMAL required version for the Mod. Components can specify others..
13-
#define REQUIRED_VERSION 2.14
13+
#define REQUIRED_VERSION 2.16
1414

1515
/*
1616
// Defined DEBUG_MODE_NORMAL in a few CBA_fncs to prevent looped logging :)

0 commit comments

Comments
 (0)