From 21ada0b3f6a03ac23a7e307a508ba8bdde925ad3 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Sat, 22 Dec 2012 02:57:35 +0000
Subject: [PATCH] - Fixed: When the player sprite is being drawn with a fixed
 colormap, hardware acceleration   should not be disabled when the regular
 colormap has lights that stay bright throughout.

SVN r4001 (trunk)
---
 src/r_things.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/r_things.cpp b/src/r_things.cpp
index 459ebdbce..386ef8139 100644
--- a/src/r_things.cpp
+++ b/src/r_things.cpp
@@ -1104,7 +1104,7 @@ void R_DrawPSprite (pspdef_t* psp, int pspnum, AActor *owner, fixed_t sx, fixed_
 		}
 		// If the main colormap has fixed lights, and this sprite is being drawn with that
 		// colormap, disable acceleration so that the lights can remain fixed.
-		if (!noaccel &&
+		if (!noaccel && realfixedcolormap == NULL &&
 			NormalLightHasFixedLights && mybasecolormap == &NormalLight &&
 			vis->pic->UseBasePalette())
 		{