From bae7b5b2ac2c90301189b36041c9b05d0edb5868 Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Sat, 19 Apr 2014 17:21:30 +0100 Subject: [PATCH 1/2] OpenGL: FOF cutting fix Fixes any FOF's with FF_SOLID not cutting each other. --- src/hardware/hw_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 0db3e9034..999185ded 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1101,9 +1101,6 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum, if (cutflag == FF_CUTSOLIDS) // These are regular walls sent in from StoreWallRange, they shouldn't be cut from this solid = false; - if (cutflag & FF_SOLID) // these weren't being cut before anyway, although they probably should be in the right conditions - solid = false; - height = FIXED_TO_FLOAT(list[i].height); if (solid) bheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight); From 46e84465e81838603b9fe77cd8cfd8deb4ea7e2c Mon Sep 17 00:00:00 2001 From: Sryder13 Date: Sun, 20 Apr 2014 10:35:50 +0100 Subject: [PATCH 2/2] OpenGL: FOF Cutting Fix 2 Fixes Translucent FOF's cutting Solid FOF's. --- src/hardware/hw_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 999185ded..adaee1a1a 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -1080,7 +1080,7 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum, if (list[i].caster) { - if (sector->lightlist[i].caster->flags & FF_SOLID && !(cutflag & FF_EXTRA)) + if (sector->lightlist[i].caster->flags & FF_CUTSOLIDS && !(cutflag & FF_EXTRA)) solid = true; else if (sector->lightlist[i].caster->flags & FF_CUTEXTRA && cutflag & FF_EXTRA) {