From 0c8a817df484c424b3c2d13cb3e324d702f645af Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 4 Feb 2016 01:12:18 +0100 Subject: [PATCH] - fixed wall clipping with 3D lights. --- src/gl/scene/gl_decal.cpp | 2 +- src/gl/scene/gl_walls_draw.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gl/scene/gl_decal.cpp b/src/gl/scene/gl_decal.cpp index 745346db7..de175fffd 100644 --- a/src/gl/scene/gl_decal.cpp +++ b/src/gl/scene/gl_decal.cpp @@ -351,7 +351,7 @@ void GLWall::DrawDecal(DBaseDecal *decal) float low1 = lowplane.ZatPoint(dv[1].x, dv[1].y); float low2 = lowplane.ZatPoint(dv[2].x, dv[2].y); - if (low1 < dv[1].z && low2 < dv[2].z) + if (low1 < dv[1].z || low2 < dv[2].z) { int thisll = (*lightlist)[k].caster != NULL ? gl_ClampLight(*(*lightlist)[k].p_lightlevel) : lightlevel; FColormap thiscm; diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index 7e91d1fe5..c06558b11 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/src/gl/scene/gl_walls_draw.cpp @@ -349,7 +349,7 @@ void GLWall::RenderTextured(int rflags) float low1 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[0])); float low2 = FIXED2FLOAT(lowplane.ZatPoint(vertexes[1])); - if (low1 < ztop[0] && low2 < ztop[1]) + if (low1 < ztop[0] || low2 < ztop[1]) { int thisll = (*lightlist)[i].caster != NULL ? gl_ClampLight(*(*lightlist)[i].p_lightlevel) : lightlevel; FColormap thiscm;