From 2c221da45358dfbd477a05a33d731569dcb53d45 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Tue, 3 May 2016 15:26:54 +0100 Subject: [PATCH] Revert "Fix up the ceiling sky hack (yuck) a bit so my commit doesn't break thok barrier planes now" This created HOMs in THZ2's skybox, ack. This reverts commit eba382df1bbe3e0f8b3ec686dc028d0c51798e1a. --- src/r_segs.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/r_segs.c b/src/r_segs.c index 9b1533daa..ca24df586 100644 --- a/src/r_segs.c +++ b/src/r_segs.c @@ -1903,11 +1903,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) && backsector->ceilingpic == skyflatnum) { #ifdef ESLOPE - worldtopslope = max(worldtopslope, worldhighslope); - worldhighslope = worldtopslope; + worldtopslope = worldhighslope = #endif - worldtop = max(worldtop, worldhigh); - worldhigh = worldtop; + worldtop = worldhigh; } ds_p->sprtopclip = ds_p->sprbottomclip = NULL; @@ -2067,13 +2065,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) markceiling = false; } -#ifdef ESLOPE - if ((worldhigh <= worldbottom && worldhighslope <= worldbottomslope) || - (worldlow >= worldtop && worldlowslope >= worldtopslope)) -#else if (backsector->ceilingheight <= frontsector->floorheight || backsector->floorheight >= frontsector->ceilingheight) -#endif { // closed door markceiling = markfloor = true;