From 9528243f89e214f5b425cb0b0de58fb387ef702f Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 20 Jan 2022 23:39:58 -0800 Subject: [PATCH] Few more instances of fullbright colormap nullification --- src/hardware/hw_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 2b4cb9fa3..3c37ce488 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -3937,7 +3937,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr) // Start with the lightlevel and colormap from the top of the sprite lightlevel = *list[sector->numlights - 1].lightlevel; - if (!(spr->mobj->renderflags & RF_NOCOLORMAPS)) + if (!R_ThingIsFullBright(spr->mobj) && !(spr->mobj->renderflags & RF_NOCOLORMAPS)) colormap = *list[sector->numlights - 1].extra_colormap; i = 0; @@ -4296,7 +4296,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) boolean lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel); extracolormap_t *colormap = NULL; - if (!(spr->mobj->renderflags & RF_NOCOLORMAPS)) + if (!R_ThingIsFullBright(spr->mobj) && !(spr->mobj->renderflags & RF_NOCOLORMAPS)) colormap = sector->extra_colormap; if (splat && sector->numlights)