stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix P_CheckSight to consider FOFs that completely block the view

Browse source 
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
This commit is contained in:
Monster Iestyn 2019-05-05 21:03:15 +01:00
parent b9611c3a81
commit ee0c4b42a6
1 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/p_sight.c
View file

@ -254,7 +254,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
// no wall to block sight with? // no wall to block sight with?
if ((front = seg->frontsector)->floorheight == if ((front = seg->frontsector)->floorheight ==
(back = seg->backsector)->floorheight && (back = seg->backsector)->floorheight &&
front->ceilingheight == back->ceilingheight) front->ceilingheight == back->ceilingheight
&& !front->ffloors && !back->ffloors)
continue; continue;
// possible occluder // possible occluder
@ -288,6 +289,41 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
if (los->topslope <= los->bottomslope) if (los->topslope <= los->bottomslope)
return false; return false;
// Monster Iestyn: check FOFs!
if (front->ffloors || back->ffloors)
{
ffloor_t *rover;
fixed_t topslope, bottomslope;
// check front sector's FOFs first
for (rover = front->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS)
|| !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT)
{
continue;
}
topslope = FixedDiv(*rover->topheight - los->sightzstart , frac);
bottomslope = FixedDiv(*rover->bottomheight - los->sightzstart , frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
// check back sector's FOFs as well
for (rover = back->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS)
|| !(rover->flags & FF_RENDERSIDES) || rover->flags & FF_TRANSLUCENT)
{
continue;
}
topslope = FixedDiv(*rover->topheight - los->sightzstart , frac);
bottomslope = FixedDiv(*rover->bottomheight - los->sightzstart , frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
// TODO: figure out if it's worth considering partially blocked cases or not?
// maybe to adjust los's top/bottom slopes if needed
}
} }
// passed the subsector ok // passed the subsector ok