From d7447dbfc1c6e6ec2b7fa80c9defe7929c05e05d Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 11 Sep 2024 17:19:18 +0200 Subject: [PATCH] no fog fullbright in binary maps --- src/hardware/hw_main.c | 4 ++-- src/r_defs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 866c1b3e0..f35b80cd5 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4864,7 +4864,7 @@ void HWR_AddTransparentFloor(levelflat_t *levelflat, extrasubsector_t *xsub, boo planeinfo[numplanes].isceiling = isceiling; planeinfo[numplanes].fixedheight = fixedheight; - planeinfo[numplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG) || !udmf) ? lightlevel : 255; + planeinfo[numplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? lightlevel : 255; planeinfo[numplanes].levelflat = levelflat; planeinfo[numplanes].xsub = xsub; planeinfo[numplanes].alpha = alpha; @@ -4895,7 +4895,7 @@ void HWR_AddTransparentPolyobjectFloor(levelflat_t *levelflat, polyobj_t *polyse polyplaneinfo[numpolyplanes].isceiling = isceiling; polyplaneinfo[numpolyplanes].fixedheight = fixedheight; - polyplaneinfo[numpolyplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG) || !udmf) ? lightlevel : 255; + polyplaneinfo[numpolyplanes].lightlevel = (planecolormap && (planecolormap->flags & CMF_FOG)) ? lightlevel : 255; polyplaneinfo[numpolyplanes].levelflat = levelflat; polyplaneinfo[numpolyplanes].polysector = polysector; polyplaneinfo[numpolyplanes].alpha = alpha; diff --git a/src/r_defs.h b/src/r_defs.h index d8d16bdc0..d2d6355f0 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -54,7 +54,7 @@ typedef struct typedef UINT8 lighttable_t; #define CMF_FADEFULLBRIGHTSPRITES 1 -#define CMF_FOG 4 +#define CMF_FOG (udmf ? 4 : 1) // ExtraColormap type. Use for extra_colormaps from now on. typedef struct extracolormap_s