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

Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2019-02-21 22:42:26 -05:00
parent e6cb47e2f2 7667122912
commit 2f8eadd211
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.cfg
View File

@ -228,6 +228,7 @@ ifdef GCC80
WFLAGS+=-Wno-format-overflow
WFLAGS+=-Wno-stringop-truncation
WFLAGS+=-Wno-stringop-overflow
WFLAGS+=-Wno-error=multistatement-macros
endif

10
src/r_segs.c
View File

@ -3063,8 +3063,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
else
markceiling = false;
// Don't render the ceiling again when rendering polyobjects
if (curline->polyseg)
// Don't mark ceiling flat lines for polys unless this line has an upper texture, otherwise we get flat leakage pulling downward
// (If it DOES have an upper texture and we do this, the ceiling won't render at all)
if (curline->polyseg && !curline->sidedef->toptexture)
markceiling = false;
}
@ -3076,8 +3077,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
else
markfloor = false;
// Don't render the floor again when rendering polyobjects
if (curline->polyseg)
// Don't mark floor flat lines for polys unless this line has a lower texture, otherwise we get flat leakage pulling upward
// (If it DOES have a lower texture and we do this, the floor won't render at all)
if (curline->polyseg && !curline->sidedef->bottomtexture)
markfloor = false;
}