zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 18:21:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed missing checks in P_TestMobjZ (#2827)

Browse source 
Adds in missing missile checks and fixes ordering to match P_CheckPosition to give more consistency.
This commit is contained in:
Boondorl 2024-11-22 06:23:53 -05:00 committed by GitHub
parent 1825c8ba77
commit 878c5f0857
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 76 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/playsim/p_map.cpp
View file

@ -2108,10 +2108,13 @@ int P_TestMobjZ(AActor *actor, bool quick, AActor **pOnmobj)
while (it.Next(&cres)) while (it.Next(&cres))
{ {
AActor *thing = cres.thing; AActor *thing = cres.thing;
if (!quick && onmobj != NULL && thing->Top() < onmobj->Top())
{ // something higher is in the way
continue;
}
double blockdist = thing->radius + actor->radius; if (thing == actor)
if (fabs(thing->X() - cres.Position.X) >= blockdist || fabs(thing->Y() - cres.Position.Y) >= blockdist) { // Don't clip against self.
{
continue; continue;
} }
if (thing->flags2 & MF2_THRUACTORS) if (thing->flags2 & MF2_THRUACTORS)
@ -2122,19 +2125,24 @@ int P_TestMobjZ(AActor *actor, bool quick, AActor **pOnmobj)
{ {
continue; continue;
} }
if ((actor->flags6 & MF6_THRUSPECIES) && (thing->GetSpecies() == actor->GetSpecies()))
{
continue;
}
if (!(thing->flags & MF_SOLID)) if (!(thing->flags & MF_SOLID))
{ // Can't hit thing { // Can't hit thing
continue; continue;
} }
if (thing->flags & (MF_SPECIAL | MF_NOCLIP)) if ((thing->flags & (MF_SPECIAL | MF_NOCLIP)) || (thing->flags6 & MF6_TOUCHY))
{ // [RH] Specials and noclippers don't block moves { // [RH] Specials and noclippers don't block moves
continue; continue;
} }
if (thing->flags & (MF_CORPSE)) const double blockdist = thing->radius + actor->radius;
if (fabs(thing->X() - cres.Position.X) >= blockdist || fabs(thing->Y() - cres.Position.Y) >= blockdist)
{
continue;
}
if ((actor->flags6 & MF6_THRUSPECIES) && thing->GetSpecies() == actor->GetSpecies())
{
continue;
}
if (thing->flags & MF_CORPSE)
{ // Corpses need a few more checks { // Corpses need a few more checks
if (!(actor->flags & MF_ICECORPSE)) if (!(actor->flags & MF_ICECORPSE))
continue; continue;
@ -2143,33 +2151,78 @@ int P_TestMobjZ(AActor *actor, bool quick, AActor **pOnmobj)
{ // [RH] Only bridges block pickup items { // [RH] Only bridges block pickup items
continue; continue;
} }
if (thing == actor) if (actor->player != nullptr && P_ShouldPassThroughPlayer(actor, thing))
{ // Don't clip against self {
continue;
}
if ((actor->flags & MF_MISSILE) && (thing == actor->target))
{ // Don't clip against whoever shot the missile.
continue; continue;
} }
if (actor->Z() > thing->Top()) if (actor->Z() > thing->Top())
{ // over thing { // over thing
continue; continue;
} }
else if (actor->Top() <= thing->Z()) if (actor->Top() <= thing->Z())
{ // under thing { // under thing
continue; continue;
} }
else if (!quick && onmobj != NULL && thing->Top() < onmobj->Top()) if (!P_CanCollideWith(actor, thing))
{ // something higher is in the way
continue;
}
else if (!P_CanCollideWith(actor, thing))
{ // If they cannot collide, they cannot block each other. { // If they cannot collide, they cannot block each other.
continue; continue;
} }
if (actor->player && P_ShouldPassThroughPlayer(actor, thing)) if ((actor->flags & MF_MISSILE) || ((actor->BounceFlags & BOUNCE_MBF) && !(actor->flags & MF_SOLID)))
{ {
continue; if (thing->flags2 & MF2_NONSHOOTABLE)
{
continue;
}
if ((thing->flags3 & MF3_GHOST) && (actor->flags2 & MF2_THRUGHOST))
{
continue;
}
if ((thing->flags4 & MF4_SPECTRAL) && !(actor->flags4 & MF4_SPECTRAL))
{
continue;
}
if (actor->target != nullptr)
{
if ((actor->flags6 & MF6_MTHRUSPECIES) && actor->target->GetSpecies() == thing->GetSpecies())
{
continue;
}
if (actor->target == thing)
{
if (!(actor->flags8 & MF8_HITOWNER))
{
continue;
}
}
else if (actor->target->player != nullptr && P_ShouldPassThroughPlayer(actor->target, thing))
{
continue;
}
}
if ((thing->flags7 & MF7_THRUREFLECT) && (thing->flags2 & MF2_REFLECTIVE) && (actor->flags & MF_MISSILE))
{
continue;
}
double clipheight = thing->Height;
if (thing->projectilepassheight > 0)
{
clipheight = thing->projectilepassheight;
}
else if (thing->projectilepassheight < 0 && (thing->Level->i_compatflags & COMPATF_MISSILECLIP))
{
clipheight = -thing->projectilepassheight;
}
if (actor->Z() > thing->Z() + clipheight)
{ // Over thing
continue;
}
if ((actor->flags2 & MF2_RIP) && !(thing->flags5 & MF5_DONTRIP)
&& (!(actor->flags6 & MF6_NOBOSSRIP) || !(thing->flags2 & MF2_BOSS))
&& CheckRipLevel(thing, actor))
{
continue;
}
} }
onmobj = thing; onmobj = thing;