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

Merge branch 'next' into demo-replay-fixes

This commit is contained in:
Monster Iestyn 2016-05-03 15:29:57 +01:00
parent 300275534f 2c221da453
commit 2954a43ce0
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/r_segs.c
View File

@ -1903,11 +1903,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
&& backsector->ceilingpic == skyflatnum) && backsector->ceilingpic == skyflatnum)
{ {
#ifdef ESLOPE #ifdef ESLOPE
worldtopslope = max(worldtopslope, worldhighslope); worldtopslope = worldhighslope =
worldhighslope = worldtopslope;
#endif #endif
worldtop = max(worldtop, worldhigh); worldtop = worldhigh;
worldhigh = worldtop;
} }
ds_p->sprtopclip = ds_p->sprbottomclip = NULL; ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
@ -2067,13 +2065,8 @@ 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;