Merge branch 'master' into unusedBase

Author: PabstMirror

addons/nightvision/functions/fnc_onVisionModeChanged.sqf

@@ -39,9 +39,9 @@ if (GVAR(effectScaling) == 0) exitWith {
 
 // Start PFEH when entering night vision mode:
 if (_visionMode > 0) then {
+    [true] call FUNC(setupDisplayEffects); // always reset effects (switching from NVG to Thermal)
     if (GVAR(PFID) == -1) then {
         GVAR(running) = true;
-        [true] call FUNC(setupDisplayEffects);
         [] call FUNC(refreshGoggleType);
         GVAR(PFID) = [LINKFUNC(pfeh), 0, []] call CBA_fnc_addPerFrameHandler;
         GVAR(firedEHs) = [

addons/nightvision/functions/fnc_pfeh.sqf

@@ -57,6 +57,9 @@ if (GVAR(defaultPositionBorder) isNotEqualTo []) then {
 };
 END_COUNTER(borderScaling);
 
+// Skip all other effects if just in thermal
+if (currentVisionMode _unit > 1) exitWith {};
+
 if (IS_MAGNIFIED isNotEqualTo GVAR(isUsingMagnification)) then {
     GVAR(isUsingMagnification) = IS_MAGNIFIED;
     GVAR(nextEffectsUpdate) = -1;

addons/nightvision/functions/fnc_setupDisplayEffects.sqf

@@ -48,6 +48,7 @@ if (GVAR(fogScaling) > 0) then {
             0 setFog GVAR(priorFog);
             GVAR(priorFog) = nil;
         } else {
+            if (currentVisionMode _unit > 1) exitWith {}; // Don't error if switching directly to thermal
             ERROR("no fog backed up");
         };