Skip to content
Snippets Groups Projects
Commit 15f976a0 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents 05c3315f b5112947
No related branches found
No related tags found
No related merge requests found
...@@ -1080,7 +1080,7 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum, ...@@ -1080,7 +1080,7 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
if (list[i].caster) 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; solid = true;
else if (sector->lightlist[i].caster->flags & FF_CUTEXTRA && cutflag & FF_EXTRA) 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, ...@@ -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 if (cutflag == FF_CUTSOLIDS) // These are regular walls sent in from StoreWallRange, they shouldn't be cut from this
solid = false; 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); height = FIXED_TO_FLOAT(list[i].height);
if (solid) if (solid)
bheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight); bheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment