zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 06:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Level as member variable in the sight checker.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-26 09:01:40 +01:00
parent 10feb446fa
commit fb86f397a0
2 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_levellocals.h
View file

@ -321,6 +321,17 @@ public:
} }
bool CheckReject(sector_t *s1, sector_t *s2)
{
if (rejectmatrix.Size() > 0)
{
int pnum = int(s1->Index()) * sectors.Size() + int(s2->Index());
return !(rejectmatrix[pnum >> 3] & (1 << (pnum & 7)));
}
return true;
}
uint8_t md5[16]; // for savegame validation. If the MD5 does not match the savegame won't be loaded. uint8_t md5[16]; // for savegame validation. If the MD5 does not match the savegame won't be loaded.
int time; // time in the hub int time; // time in the hub
int maptime; // time in the map int maptime; // time in the map

51
src/p_sight.cpp
View file

@ -92,6 +92,7 @@ static TArray<SightTask> portals(32);
class SightCheck class SightCheck
{ {
FLevelLocals *Level;
DVector3 sightstart; DVector3 sightstart;
DVector2 sightend; DVector2 sightend;
double Startfrac; double Startfrac;
@ -116,6 +117,11 @@ class SightCheck
bool LineBlocksSight(line_t *ld); bool LineBlocksSight(line_t *ld);
public: public:
SightCheck(FLevelLocals *l)
{
Level = l;
}
bool P_SightPathTraverse (); bool P_SightPathTraverse ();
void init(AActor * t1, AActor * t2, sector_t *startsector, SightTask *task, int flags) void init(AActor * t1, AActor * t2, sector_t *startsector, SightTask *task, int flags)
@ -407,7 +413,7 @@ bool SightCheck::LineBlocksSight(line_t *ld)
{ {
return true; return true;
} }
if (ld->args[1] != 0 && ld->args[1] != level.levelnum) if (ld->args[1] != 0 && ld->args[1] != Level->levelnum)
{ {
return true; return true;
} }
@ -477,14 +483,14 @@ int SightCheck::P_SightBlockLinesIterator (int x, int y)
polyblock_t *polyLink; polyblock_t *polyLink;
unsigned int i; unsigned int i;
offset = y*level.blockmap.bmapwidth+x; offset = y* Level->blockmap.bmapwidth+x;
// if any of the previous blocks may contain a portal we may abort the collection of lines here, but we may not abort the sight check. // if any of the previous blocks may contain a portal we may abort the collection of lines here, but we may not abort the sight check.
// (We still try to delay activating this for as long as possible.) // (We still try to delay activating this for as long as possible.)
portalfound = portalfound || level.PortalBlockmap(x, y).containsLinkedPortals; portalfound = portalfound || Level->PortalBlockmap(x, y).containsLinkedPortals;
polyLink = level.PolyBlockMap[offset]; polyLink = Level->PolyBlockMap[offset];
portalfound |= (polyLink && level.PortalBlockmap.hasLinkedPolyPortals); portalfound |= (polyLink && Level->PortalBlockmap.hasLinkedPolyPortals);
while (polyLink) while (polyLink)
{ {
if (polyLink->polyobj) if (polyLink->polyobj)
@ -505,9 +511,9 @@ int SightCheck::P_SightBlockLinesIterator (int x, int y)
polyLink = polyLink->next; polyLink = polyLink->next;
} }
for (list = level.blockmap.GetLines(x, y); *list != -1; list++) for (list = Level->blockmap.GetLines(x, y); *list != -1; list++)
{ {
if (!P_SightCheckLine (&level.lines[*list])) if (!P_SightCheckLine (&Level->lines[*list]))
{ {
if (!portalfound) return 0; if (!portalfound) return 0;
else res = -1; else res = -1;
@ -661,13 +667,13 @@ bool SightCheck::P_SightPathTraverse ()
portals.Push({ 0, topslope, bottomslope, sector_t::floor, lastsector->GetOppositePortalGroup(sector_t::floor) }); portals.Push({ 0, topslope, bottomslope, sector_t::floor, lastsector->GetOppositePortalGroup(sector_t::floor) });
} }
x1 -= level.blockmap.bmaporgx; x1 -= Level->blockmap.bmaporgx;
y1 -= level.blockmap.bmaporgy; y1 -= Level->blockmap.bmaporgy;
xt1 = x1 / FBlockmap::MAPBLOCKUNITS; xt1 = x1 / FBlockmap::MAPBLOCKUNITS;
yt1 = y1 / FBlockmap::MAPBLOCKUNITS; yt1 = y1 / FBlockmap::MAPBLOCKUNITS;
x2 -= level.blockmap.bmaporgx; x2 -= Level->blockmap.bmaporgx;
y2 -= level.blockmap.bmaporgy; y2 -= Level->blockmap.bmaporgy;
xt2 = x2 / FBlockmap::MAPBLOCKUNITS; xt2 = x2 / FBlockmap::MAPBLOCKUNITS;
yt2 = y2 / FBlockmap::MAPBLOCKUNITS; yt2 = y2 / FBlockmap::MAPBLOCKUNITS;
@ -747,7 +753,7 @@ bool SightCheck::P_SightPathTraverse ()
{ {
// end traversing when reaching the end of the blockmap // end traversing when reaching the end of the blockmap
// an early out is not possible because with portals a trace can easily land outside the map's bounds. // an early out is not possible because with portals a trace can easily land outside the map's bounds.
if (!level.blockmap.isValidBlock(mapx, mapy)) if (!Level->blockmap.isValidBlock(mapx, mapy))
{ {
break; break;
} }
@ -839,22 +845,17 @@ int P_CheckSight (AActor *t1, AActor *t2, int flags)
bool res; bool res;
assert (t1 != NULL); assert (t1 != nullptr);
assert (t2 != NULL); assert (t2 != nullptr);
if (t1 == NULL || t2 == NULL) if (t1 == nullptr || t2 == nullptr)
{ {
return false; return false;
} }
const sector_t *s1 = t1->Sector; //
const sector_t *s2 = t2->Sector; // check for trivial rejection
int pnum = int(s1->Index()) * level.sectors.Size() + int(s2->Index()); //
if (!level.CheckReject(t1->Sector, t2->Sector))
//
// check for trivial rejection
//
if (level.rejectmatrix.Size() > 0 &&
(level.rejectmatrix[pnum>>3] & (1 << (pnum & 7))))
{ {
sightcounts[0]++; sightcounts[0]++;
res = false; // can't possibly be connected res = false; // can't possibly be connected
@ -911,7 +912,7 @@ sightcounts[0]++;
SightTask task = { 0, topslope, bottomslope, -1, sec->PortalGroup }; SightTask task = { 0, topslope, bottomslope, -1, sec->PortalGroup };
SightCheck s; SightCheck s(&level);
s.init(t1, t2, sec, &task, flags); s.init(t1, t2, sec, &task, flags);
res = s.P_SightPathTraverse (); res = s.P_SightPathTraverse ();
if (!res) if (!res)