From dc3b9c648a5e93ff8d7db4e1048ca533d6a12055 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 24 Jan 2024 03:09:09 +0100 Subject: [PATCH] make this a little neater --- src/hardware/hw_main.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 9c1ab2908..09bdc8784 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6533,23 +6533,20 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, if (blend & PF_Environment) blendmode |= PF_Occlude; // PF_Occlude must be used for solid objects - if (fogwall) + if (HWR_UseShader()) { - blendmode |= PF_Fog; - shader = SHADER_FOG; // fog shader - } + if (fogwall) + shader = SHADER_FOG; + else + shader = SHADER_WALL; - blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency - - if (!fogwall) - { - if (HWR_UseShader()) - { - shader = SHADER_WALL; // wall shader - blendmode |= PF_ColorMapped; - } + blendmode |= PF_ColorMapped; } + if (fogwall) + blendmode |= PF_Fog; + + blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode, shader, false); #ifdef WALLSPLATS