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

Merge branch 'master' into sdl2

This commit is contained in:
Alam Ed Arias 2014-05-27 15:19:18 -04:00
parent d597856c8f b511294749
commit b520d61ba2
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/hw_main.c
View File

@ -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)
{
@ -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);