lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up the ceiling sky hack (yuck) a bit so my commit doesn't break thok barrier planes now 

Interestingly these changes somehow fix how thok barrier walls block the planes, which was an issue even before slopes I believe
This commit is contained in:
Monster Iestyn 2016-05-02 22:08:14 +01:00
parent b5afc70cc8
commit eba382df1b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/r_segs.c
View File

@ -1903,9 +1903,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
&& backsector->ceilingpic == skyflatnum) && backsector->ceilingpic == skyflatnum)
{ {
#ifdef ESLOPE #ifdef ESLOPE
worldtopslope = worldhighslope = worldtopslope = max(worldtopslope, worldhighslope);
worldhighslope = worldtopslope;
#endif #endif
worldtop = worldhigh; worldtop = max(worldtop, worldhigh);
worldhigh = worldtop;
} }
ds_p->sprtopclip = ds_p->sprbottomclip = NULL; ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
@ -2065,8 +2067,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
markceiling = false; markceiling = false;
} }
#ifdef ESLOPE
if ((worldhigh <= worldbottom && worldhighslope <= worldbottomslope) ||
(worldlow >= worldtop && worldlowslope >= worldtopslope))
#else
if (backsector->ceilingheight <= frontsector->floorheight || if (backsector->ceilingheight <= frontsector->floorheight ||
backsector->floorheight >= frontsector->ceilingheight) backsector->floorheight >= frontsector->ceilingheight)
#endif
{ {
// closed door // closed door
markceiling = markfloor = true; markceiling = markfloor = true;