mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-26 12:21:19 +00:00
Merge remote-tracking branch 'Sryder13/master'
This commit is contained in:
commit
b511294749
1 changed files with 1 additions and 4 deletions
|
@ -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,
|
||||||
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);
|
||||||
|
|
Loading…
Reference in a new issue