zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The initial check for ceiling and floor portals must be done when the trace's start position and its sector has been calculated. SightCheck::init is too early for that.

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-08 10:44:03 +01:00
parent f35d966799
commit f852ead99a
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/p_sight.cpp
View file

@ -97,6 +97,7 @@ class SightCheck
int Flags; int Flags;
divline_t trace; divline_t trace;
int portaldir; int portaldir;
int portalgroup;
bool portalfound; bool portalfound;
unsigned int myseethrough; unsigned int myseethrough;
@ -127,15 +128,6 @@ public:
portalfound = false; portalfound = false;
myseethrough = FF_SEETHROUGH; myseethrough = FF_SEETHROUGH;
if (portaldir != sector_t::floor && !t1->Sector->PortalBlocksSight(sector_t::ceiling))
{
portals.Push({ 0, topslope, bottomslope, sector_t::ceiling, t1->Sector->SkyBoxes[sector_t::ceiling]->Sector->PortalGroup });
}
if (portaldir != sector_t::ceiling && !t1->Sector->PortalBlocksSight(sector_t::floor))
{
portals.Push({ 0, topslope, bottomslope, sector_t::floor, t1->Sector->SkyBoxes[sector_t::floor]->Sector->PortalGroup });
}
} }
}; };
@ -620,6 +612,7 @@ bool SightCheck::P_SightPathTraverse ()
// for FF_SEETHROUGH the following rule applies: // for FF_SEETHROUGH the following rule applies:
// If the viewer is in an area without FF_SEETHROUGH he can only see into areas without this flag // If the viewer is in an area without FF_SEETHROUGH he can only see into areas without this flag
// If the viewer is in an area with FF_SEETHROUGH he can only see into areas with this flag // If the viewer is in an area with FF_SEETHROUGH he can only see into areas with this flag
bool checkfloor = true, checkceiling = true;
for(unsigned int i=0;i<lastsector->e->XFloor.ffloors.Size();i++) for(unsigned int i=0;i<lastsector->e->XFloor.ffloors.Size();i++)
{ {
F3DFloor* rover = lastsector->e->XFloor.ffloors[i]; F3DFloor* rover = lastsector->e->XFloor.ffloors[i];
@ -629,6 +622,9 @@ bool SightCheck::P_SightPathTraverse ()
fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sightstart); fixed_t ff_bottom=rover->bottom.plane->ZatPoint(sightstart);
fixed_t ff_top=rover->top.plane->ZatPoint(sightstart); fixed_t ff_top=rover->top.plane->ZatPoint(sightstart);
if (sightstart.z < ff_top) checkceiling = false;
if (sightstart.z >= ff_bottom) checkfloor = false;
if (sightstart.z < ff_top && sightstart.z >= ff_bottom) if (sightstart.z < ff_top && sightstart.z >= ff_bottom)
{ {
myseethrough = rover->flags & FF_SEETHROUGH; myseethrough = rover->flags & FF_SEETHROUGH;
@ -636,6 +632,16 @@ bool SightCheck::P_SightPathTraverse ()
} }
} }
// We also must check if the starting sector contains portals, and start sight checks in those as well.
if (portaldir != sector_t::floor && checkceiling && !lastsector->PortalBlocksSight(sector_t::ceiling))
{
portals.Push({ 0, topslope, bottomslope, sector_t::ceiling, lastsector->SkyBoxes[sector_t::ceiling]->Sector->PortalGroup });
}
if (portaldir != sector_t::ceiling && checkfloor && !lastsector->PortalBlocksSight(sector_t::floor))
{
portals.Push({ 0, topslope, bottomslope, sector_t::floor, lastsector->SkyBoxes[sector_t::floor]->Sector->PortalGroup });
}
if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0) if ( ((x1-bmaporgx)&(MAPBLOCKSIZE-1)) == 0)
x1 += FRACUNIT; // don't side exactly on a line x1 += FRACUNIT; // don't side exactly on a line
if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0) if ( ((y1-bmaporgy)&(MAPBLOCKSIZE-1)) == 0)