From a375e068f70f9d0bd5942877a50943f1752cd64a Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 23 Feb 2020 13:29:38 +0100
Subject: [PATCH] don't apply AimDownSightsBlur on optics with integrated night
 vision

---
 .../functions/fnc_onCameraViewChanged.sqf     |  2 +-
 addons/nightvision/functions/fnc_pfeh.sqf     | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/nightvision/functions/fnc_onCameraViewChanged.sqf b/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
index 09eb8e247f..ee1b9ede80 100644
--- a/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
+++ b/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
@@ -20,7 +20,7 @@ params ["_unit", "_cameraView"];
 TRACE_2("onCameraViewChanged",_unit,_cameraView);
 
 // Refresh goggle effect (e.g. switching to vehicle's NVG)
-[] call FUNC(refreshGoggleType);
+FUNC(refreshGoggleType) call CBA_fnc_execNextFrame;
 
 if (GVAR(disableNVGsWithSights) && {(hmd _unit) != ""}) then {
     if ((vehicle _unit == _unit)
diff --git a/addons/nightvision/functions/fnc_pfeh.sqf b/addons/nightvision/functions/fnc_pfeh.sqf
index 3678f8d27a..d0baaf4bbb 100644
--- a/addons/nightvision/functions/fnc_pfeh.sqf
+++ b/addons/nightvision/functions/fnc_pfeh.sqf
@@ -16,7 +16,9 @@
  * Public: No
  */
 
-if ((currentVisionMode ACE_player) != 1) exitWith {
+private _unit = ACE_player;
+
+if (currentVisionMode _unit != 1) exitWith {
     GVAR(running) = false;
     [false] call FUNC(setupDisplayEffects);
     [GVAR(PFID)] call CBA_fnc_removePerFrameHandler;
@@ -28,7 +30,7 @@ if ((currentVisionMode ACE_player) != 1) exitWith {
 };
 if (EGVAR(common,OldIsCamera)) exitWith {
     if (GVAR(running)) then {
-        TRACE_2("pausing NVG for scripted camera",alive ACE_player,EGVAR(common,OldIsCamera));
+        TRACE_2("pausing NVG for scripted camera",alive _unit,EGVAR(common,OldIsCamera));
         GVAR(running) = false;
         [false] call FUNC(setupDisplayEffects);
     };
@@ -45,7 +47,7 @@ BEGIN_COUNTER(borderScaling);
 private _scale = (call EFUNC(common,getZoom)) * 1.12513;
 if (!(GVAR(defaultPositionBorder) isEqualTo [])) then {
     // Prevents issues when "zooming out" on ultra wide monitors - The square mask would be narrower than the screen
-    if (((GVAR(defaultPositionBorder) select 2) * _scale) < safeZoneW) then {
+    if ((GVAR(defaultPositionBorder) select 2) * _scale < safeZoneW) then {
         _scale = safeZoneW / (GVAR(defaultPositionBorder) select 2);
     };
     [(uiNamespace getVariable QGVAR(titleDisplay)) displayCtrl 1000, GVAR(defaultPositionHex), _scale] call FUNC(scaleCtrl);
@@ -87,10 +89,11 @@ if (CBA_missionTime < GVAR(nextEffectsUpdate)) then {
     private _fogApply = linearConversion [0, 1, _effectiveLight, ST_NVG_MAXFOG, ST_NVG_MINFOG, true];
 
     // Modify blur if looking down scope
-    if ((cameraView == "GUNNER") && {[ACE_player] call CBA_fnc_canUseWeapon}) then {
-        if (currentWeapon ACE_player == "") exitWith {};
-        if (currentWeapon ACE_player == primaryWeapon ACE_player) exitWith {_blurFinal = _blurFinal * linearConversion [0, 1, GVAR(aimDownSightsBlur), 1, ST_NVG_CAMERA_BLUR_SIGHTS_RIFLE]}; // Rifles are bad
-        if (currentWeapon ACE_player == handgunWeapon ACE_player) exitWith {_blurFinal = _blurFinal * linearConversion [0, 1, GVAR(aimDownSightsBlur), 1, ST_NVG_CAMERA_BLUR_SIGHTS_PISTOL]}; // Pistols aren't so bad
+    if (cameraView == "GUNNER" && {[_unit] call CBA_fnc_canUseWeapon && {systemChat str (0.75 call CBA_fnc_getFOV select 1); 0.75 call CBA_fnc_getFOV select 1 < 3.01}}) then {
+        private _weapon = currentWeapon _unit;
+        if (_weapon == "") exitWith {};
+        if (_weapon == primaryWeapon _unit) exitWith {_blurFinal = _blurFinal * linearConversion [0, 1, GVAR(aimDownSightsBlur), 1, ST_NVG_CAMERA_BLUR_SIGHTS_RIFLE]}; // Rifles are bad
+        if (_weapon == handgunWeapon _unit) exitWith {_blurFinal = _blurFinal * linearConversion [0, 1, GVAR(aimDownSightsBlur), 1, ST_NVG_CAMERA_BLUR_SIGHTS_PISTOL]}; // Pistols aren't so bad
     };
 
     // Scale general effects based on ace_nightvision_effectScaling setting
@@ -99,7 +102,7 @@ if (CBA_missionTime < GVAR(nextEffectsUpdate)) then {
     _contrastFinal = linearConversion [0, 1, GVAR(effectScaling), 1, _contrastFinal];
 
     // Add adjusted NVG brightness
-    private _playerBrightSetting = ACE_player getVariable [QGVAR(NVGBrightness), 0];
+    private _playerBrightSetting = _unit getVariable [QGVAR(NVGBrightness), 0];
     _brightFinal = _brightFinal + (_playerBrightSetting / 20);
 
     // Scale grain effects based on ace_nightvision_noiseScaling setting
@@ -148,9 +151,12 @@ if (CBA_missionTime < GVAR(nextEffectsUpdate)) then {
 
     // Modify local fog:
     if (GVAR(fogScaling) > 0) then {
-        if (((vehicle ACE_player) != ACE_player) && {(vehicle ACE_player) isKindOf "Air"}) then {  // For flying in particular, can refine nicer later.
+        private _vehicle = vehicle _unit;
+
+        if (_vehicle != _unit && {_vehicle isKindOf "Air"}) then {  // For flying in particular, can refine nicer later.
             _fogApply = _fogApply * ST_NVG_AIR_FOG_MULTIPLIER;
         };
+
         _fogApply = linearConversion [0, 1, GVAR(priorFog) select 0, (GVAR(fogScaling) * _fogApply), 1]; // mix in old fog if present
         GVAR(nvgFog) = [_fogApply, 0, 0];
         0 setFog GVAR(nvgFog)