From cb792b36a48e0094389ab3c3024207f0917f6786 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 9 Oct 2021 17:57:58 -0500 Subject: [PATCH] Common - Add support for commander turrets to cba_common_fnc_turretDir --- addons/common/fnc_turretDir.sqf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/common/fnc_turretDir.sqf b/addons/common/fnc_turretDir.sqf index f3dd02600..152e608e2 100644 --- a/addons/common/fnc_turretDir.sqf +++ b/addons/common/fnc_turretDir.sqf @@ -33,6 +33,9 @@ private _gunBeg = _vehicle selectionPosition getText (_turretConfig >> "gunBeg") private _gunEnd = _vehicle selectionPosition getText (_turretConfig >> "gunEnd"); if (_gunEnd isEqualTo _gunBeg) then { + if ((getNumber (_turretConfig >> "primaryObserver")) == 1) exitWith { + _gunBeg = _gunEnd vectorAdd (_vehicle vectorWorldToModel eyeDirection _vehicle); + }; private _vehicleConfig = configOf _vehicle; if (((getNumber (_vehicleConfig >> "isUAV")) == 1) && {_turret isEqualto [0]}) then { _gunBeg = _vehicle selectionPosition getText (_vehicleConfig >> "uavCameraGunnerDir"); @@ -43,8 +46,8 @@ if (_gunEnd isEqualTo _gunBeg) then { }; if !(_relativeToModel) then { - _gunBeg = AGLToASL (_vehicle modelToWorld _gunBeg); - _gunEnd = AGLToASL (_vehicle modelToWorld _gunEnd); + _gunBeg = _vehicle modelToWorldWorld _gunBeg; + _gunEnd = _vehicle modelToWorldWorld _gunEnd; }; private _turretDir = _gunEnd vectorFromTo _gunBeg;