From 342f1abcc7882183f00df1da4c17d09515f57307 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 30 Jan 2016 00:45:47 +0100
Subject: [PATCH] - fixed: flickering dynamic lights with their first intensity
 value larger than the second one weren't properly linked into all touching
 sectors.

---
 src/gl/dynlights/a_dynlight.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gl/dynlights/a_dynlight.cpp b/src/gl/dynlights/a_dynlight.cpp
index 575fa2e112..9a13d9e091 100644
--- a/src/gl/dynlights/a_dynlight.cpp
+++ b/src/gl/dynlights/a_dynlight.cpp
@@ -42,6 +42,7 @@
 #include "g_level.h"
 #include "thingdef/thingdef.h"
 #include "i_system.h"
+#include "templates.h"
 
 
 #include "gl/renderer/gl_renderer.h"
@@ -361,7 +362,7 @@ void ADynamicLight::UpdateLocation()
 
 		if (lighttype == FlickerLight || lighttype == RandomFlickerLight) 
 		{
-			intensity = float(m_intensity[1]);
+			intensity = float(MAX(m_intensity[0], m_intensity[1]));
 		}
 		else
 		{