From 97a4080496446437e4f6069c48bad804bbbc0fb2 Mon Sep 17 00:00:00 2001 From: drfrag Date: Sat, 13 Feb 2021 14:49:23 +0100 Subject: [PATCH] - Amend previous commit: fix the wallsprites crash. --- src/rendering/swrenderer/things/r_wallsprite.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rendering/swrenderer/things/r_wallsprite.cpp b/src/rendering/swrenderer/things/r_wallsprite.cpp index ce0ada698c..0d97de193f 100644 --- a/src/rendering/swrenderer/things/r_wallsprite.cpp +++ b/src/rendering/swrenderer/things/r_wallsprite.cpp @@ -165,13 +165,13 @@ namespace swrenderer return; // Prepare lighting - + FSWColormap *usecolormap = spr->Light.BaseColormap; // Decals that are added to the scene must fade to black. ColormapLight cmlight; - if ((cmlight.BaseColormap) && - (spr->RenderStyle == LegacyRenderStyles[STYLE_Add] && cmlight.BaseColormap->Fade != 0)) + if (usecolormap && + spr->RenderStyle == LegacyRenderStyles[STYLE_Add] && usecolormap->Fade != 0) { - cmlight.BaseColormap = GetSpecialLights(cmlight.BaseColormap->Color, 0, cmlight.BaseColormap->Desaturate); + cmlight.BaseColormap = GetSpecialLights(usecolormap->Color, 0, usecolormap->Desaturate); } SpriteDrawerArgs drawerargs;