From 8e25472d5b4d5b27d85eff4bf96269fca944ebe9 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 21 Aug 2023 14:23:53 -0500 Subject: [PATCH] Night Vision - Use default effects when controlling UAVs (#9338) --- addons/nightvision/XEH_postInit.sqf | 1 + addons/nightvision/functions/fnc_refreshGoggleType.sqf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/nightvision/XEH_postInit.sqf b/addons/nightvision/XEH_postInit.sqf index 77187b2d7c..9bfee4d166 100644 --- a/addons/nightvision/XEH_postInit.sqf +++ b/addons/nightvision/XEH_postInit.sqf @@ -31,6 +31,7 @@ GVAR(isUsingMagnification) = false; ["cameraView", LINKFUNC(onCameraViewChanged), true] call CBA_fnc_addPlayerEventHandler; ["vehicle", LINKFUNC(refreshGoggleType), false] call CBA_fnc_addPlayerEventHandler; ["turret", LINKFUNC(refreshGoggleType), true] call CBA_fnc_addPlayerEventHandler; + ["ACE_controlledUAV", LINKFUNC(refreshGoggleType)] call CBA_fnc_addEventHandler; // handle only brightness if effects are disabled GVAR(ppEffectNVGBrightness) = ppEffectCreate ["ColorCorrections", 1236]; diff --git a/addons/nightvision/functions/fnc_refreshGoggleType.sqf b/addons/nightvision/functions/fnc_refreshGoggleType.sqf index 40f94a7bfc..6d8ce8ef46 100644 --- a/addons/nightvision/functions/fnc_refreshGoggleType.sqf +++ b/addons/nightvision/functions/fnc_refreshGoggleType.sqf @@ -28,7 +28,7 @@ private _blurRadius = -1; // Adds Array of Params / Original ACE3's (ST's) by default. (NVG_GREEN_PRESET) private _preset = getArray (configFile >> "CfgWeapons" >> "NVGoggles" >> "colorPreset"); -if (alive ACE_player) then { +if ((alive ACE_player) && {isNull (ACE_controlledUAV select 0)}) then { if (((vehicle ACE_player) == ACE_player) || { // Test if we are using player's nvg or if sourced from vehicle: