From a1d72b81bf47b6b275a18c285bbbf192cc945acd Mon Sep 17 00:00:00 2001
From: BaerMitUmlaut <florian.foss@gmail.com>
Date: Wed, 28 Oct 2015 17:13:05 +0100
Subject: [PATCH] Switch to unit namespace, added !hasHatch condition

---
 addons/nightvision/XEH_postInitClient.sqf         |  2 --
 .../functions/fnc_onCameraViewChanged.sqf         | 15 +++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf
index accc1872be..e7c1ec9bc5 100644
--- a/addons/nightvision/XEH_postInitClient.sqf
+++ b/addons/nightvision/XEH_postInitClient.sqf
@@ -70,5 +70,3 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
 },
 {false},
 [209, [false, false, true]], false] call cba_fnc_addKeybind; //PageDown + ALT
-
-GVAR(reenableNVGs) = false;
diff --git a/addons/nightvision/functions/fnc_onCameraViewChanged.sqf b/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
index adc221c06d..5384d6924c 100644
--- a/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
+++ b/addons/nightvision/functions/fnc_onCameraViewChanged.sqf
@@ -20,15 +20,18 @@
 params ["_unit", "_cameraView"];
 
 if (GVAR(disableNVGsWithSights) && {(hmd _unit) != ""}) then {
-    (assignedVehicleRole _unit) params ["_role", "_turretPath"];
-    if ((vehicle _unit == _unit) || {isTurnedOut _unit} || {_role == "cargo" && {!(isNil "_turretPath")}}) then {
-        if ((_cameraView == "GUNNER") && {currentVisionMode _unit > 0}) then {
+    if ((vehicle _unit == _unit)
+        || {isTurnedOut _unit}
+        || {!([_unit] call EFUNC(common,hasHatch))
+            && {[_unit] call EFUNC(common,getTurretIndex) in ([vehicle _unit] call EFUNC(common,getTurretsFFV))}
+           }) then {
+        if ((_cameraView == "GUNNER") && {currentVisionMode _unit == 1}) then {
             _unit action ["NVGogglesOff", _unit];
-            GVAR(reenableNVGs) = true;
+            _unit setVariable [QGVAR(reenableNVGs), true];
         } else {
-            if (GVAR(reenableNVGs) && {_cameraView != "GUNNER"}) then {
+            if (_unit getVariable [QGVAR(reenableNVGs), false] && {_cameraView != "GUNNER"}) then {
                 _unit action ["NVGoggles", _unit];
-                GVAR(reenableNVGs) = false;
+                _unit setVariable [QGVAR(reenableNVGs), false];
             };
         };
     };