Use new unitTurret command

CBATeam · Oct 16, 2020 · dde05e7 · dde05e7
1 parent 79c04b6
commit dde05e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/addons/common/fnc_turretPath.sqf b/addons/common/fnc_turretPath.sqf
@@ -27,4 +27,9 @@ params [["_unit", objNull, [objNull]]];
 
 private _vehicle = vehicle _unit;
 
-(allTurrets [_vehicle, true] select {(_vehicle turretUnit _x) isEqualTo _unit}) param [0, []]
+private _turret = _vehicle unitTurret _unit;
+
+// driver will be returned as [] to be consistant with previous behaviour
+if (_turret isEqualTo [-1]) exitWith { [] };
+
+_turret
diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf
@@ -66,10 +66,7 @@ private _id = switch (_type) do {
     case "turretweapon": {
         if (_applyRetroactively) then {
             private _vehicle = vehicle GVAR(oldUnit);
-            private _turret = [];
-            if (GVAR(oldUnit) != _vehicle) then {
-                _turret = ([[-1]] + allTurrets [_vehicle, true]) select {_vehicle turretUnit _x == GVAR(oldUnit)} param [0, []];
-            };
+            private _turret = _vehicle unitTurret GVAR(oldUnit);
             [GVAR(oldUnit), _vehicle currentWeaponTurret _turret, ""] call _function;
         };
         [QGVAR(turretWeaponEvent), _function] call CBA_fnc_addEventHandler // return id
@@ -101,10 +98,7 @@ private _id = switch (_type) do {
     case "turret": {
         if (_applyRetroactively) then {
             private _vehicle = vehicle GVAR(oldUnit);
-            private _turret = [];
-            if (GVAR(oldUnit) != _vehicle) then {
-                _turret = ([[-1]] + allTurrets [_vehicle, true]) select {_vehicle turretUnit _x == GVAR(oldUnit)} param [0, []];
-            };
+            private _turret = _vehicle unitTurret GVAR(oldUnit);
             [GVAR(oldUnit), _turret, []] call _function;
         };
         [QGVAR(turretEvent), _function] call CBA_fnc_addEventHandler // return id

diff --git a/addons/events/fnc_playerEvent.sqf b/addons/events/fnc_playerEvent.sqf
@@ -37,11 +37,8 @@ if (!isNull getConnectedUAV _unit) then {
     };
 };
 
-private _turret = [];
-if (_unit != _vehicle) then {
-    // Unlike CBA_fnc_turretPath, this will return [-1] when player is driver
-    _turret = ([[-1]] + allTurrets [_vehicle, true]) select {_vehicle turretUnit _x == _unit} param [0, []];
-};
+// Unlike CBA_fnc_turretPath, this will return [-1] when player is driver
+private _turret = _vehicle unitTurret _unit;
 
 private _state = [
     _unit, group _unit, leader _unit,