zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- minor tweaks to checkOpening

Browse source 
mainly some extensions to let it replace cliptestsector.
This commit is contained in:
Christoph Oelckers 2022-10-13 17:07:06 +02:00
parent 2190499d63
commit 40271e15b3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/core/gamefuncs.cpp
View file

@ -1183,14 +1183,18 @@ void neartag(const DVector3& pos, sectortype* startsect, DAngle angle, HitInfoBa
//
//==========================================================================
bool checkOpening(const DVector3& pos, const sectortype* sec, const sectortype* nextsec, double ceilingdist, double floordist)
bool checkOpening(const DVector2& inpos, double z, const sectortype* sec, const sectortype* nextsec, double ceilingdist, double floordist, bool precise)
{
DVector2 pos;
if (precise) SquareDistToSector(inpos.X, inpos.Y, nextsec, &pos);
else pos = inpos;
double c1, c2, f1, f2;
calcSlope(sec, pos.X, pos.Y, &c1, &f1);
calcSlope(nextsec, pos.X, pos.Y, &c2, &f2);
return ((f2 < f1 - 1 && (nextsec->floorstat & CSTAT_SECTOR_SKY) == 0 && pos.Z >= f2 - (floordist - zmaptoworld)) ||
(c2 > c1 + 1 && (nextsec->ceilingstat & CSTAT_SECTOR_SKY) == 0 && pos.Z <= c2 + (ceilingdist - zmaptoworld)));
return ((f2 < f1 - 1 && (nextsec->floorstat & CSTAT_SECTOR_SKY) == 0 && z >= f2 - (floordist - zmaptoworld)) ||
(c2 > c1 + 1 && (nextsec->ceilingstat & CSTAT_SECTOR_SKY) == 0 && z <= c2 + (ceilingdist - zmaptoworld)));
}
//==========================================================================
@ -1228,7 +1232,7 @@ int pushmove(DVector3& pos, sectortype** pSect, double walldist, double ceildist
else
{
auto pvect = NearestPointOnWall(pos.X, pos.Y, wal);
blocked = checkOpening(DVector3(pvect, pos.Z), sec, wal->nextSector(), ceildist, floordist);
blocked = checkOpening(pvect, pos.Z, sec, wal->nextSector(), ceildist, floordist);
}
if (blocked)

1
source/core/gamefuncs.h
View file

@ -264,6 +264,7 @@ bool checkRangeOfWallSprite(DCoreActor* itActor, const DVector3& pos, double max
bool checkRangeOfFloorSprite(DCoreActor* itActor, const DVector3& pos, double maxdist, double& theZ);
void getzrange(const DVector3& pos, sectortype* sect, double* ceilz, CollisionBase& ceilhit, double* florz, CollisionBase& florhit, double walldist, uint32_t cliptype);
bool checkOpening(const DVector2& inpos, double z, const sectortype* sec, const sectortype* nextsec, double ceilingdist, double floordist, bool precise = false);
int pushmove(DVector3& pos, sectortype** pSect, double walldist, double ceildist, double flordist, unsigned cliptype);
tspritetype* renderAddTsprite(tspriteArray& tsprites, DCoreActor* actor);