From 4f5d5d5de78f15581144a189a69aa1b8ef5d4435 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 28 Jan 2017 21:49:52 +0100 Subject: [PATCH] - this should have been in the last commit. --- src/gl/renderer/gl_lightdata.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gl/renderer/gl_lightdata.cpp b/src/gl/renderer/gl_lightdata.cpp index 3ba557737..b0dccbcba 100644 --- a/src/gl/renderer/gl_lightdata.cpp +++ b/src/gl/renderer/gl_lightdata.cpp @@ -304,6 +304,11 @@ float gl_GetFogDensity(int lightlevel, PalEntry fogcolor, int sectorfogdensity) // uses approximations of Legacy's default settings. density = fogdensity ? fogdensity : 18; } + else if (sectorfogdensity != 0) + { + // case 2: Sector has an explicit fog density set. + density = sectorfogdensity; + } else if ((fogcolor.d & 0xffffff) == 0) { // case 1: black fog @@ -316,11 +321,6 @@ float gl_GetFogDensity(int lightlevel, PalEntry fogcolor, int sectorfogdensity) density = 0; } } - else if (sectorfogdensity != 0) - { - // case 2: Sector has an explicit fog density set. - density = sectorfogdensity; - } else if (outsidefogdensity != 0 && outsidefogcolor.a != 0xff && (fogcolor.d & 0xffffff) == (outsidefogcolor.d & 0xffffff)) { // case 3. outsidefogdensity has already been set as needed