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

Added CollidedWith

Browse source 
Guarantees a collision happened unlike CanCollideWith. Called in TryMove so it only calls when an actual movement was attempted and not just a potential positional check.
This commit is contained in:
Boondorl 2023-12-16 01:23:32 -05:00 committed by Rachael Alexanderson
parent c1d4fa554e
commit fc6191deb9
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/playsim/p_map.cpp
View file

@ -2257,6 +2257,25 @@ static void CheckForPushSpecial(line_t *line, int side, AActor *mobj, DVector2 *
} }
} }
static void P_CollidedWith(AActor* const collider, AActor* const collidee)
{
{
IFVIRTUALPTR(collider, AActor, CollidedWith)
{
VMValue params[] = { collider, collidee, false };
VMCall(func, params, 3, nullptr, 0);
}
}
{
IFVIRTUALPTR(collidee, AActor, CollidedWith)
{
VMValue params[] = { collidee, collider, true };
VMCall(func, params, 3, nullptr, 0);
}
}
}
//========================================================================== //==========================================================================
// //
// P_TryMove // P_TryMove
@ -2289,6 +2308,11 @@ bool P_TryMove(AActor *thing, const DVector2 &pos,
if (!P_CheckPosition(thing, pos, tm)) if (!P_CheckPosition(thing, pos, tm))
{ {
AActor *BlockingMobj = thing->BlockingMobj; AActor *BlockingMobj = thing->BlockingMobj;
// This gets called regardless of whether or not the following checks allow the thing to pass. This is because a player
// could step on top of an enemy but we still want it to register as a collision.
if (BlockingMobj != nullptr && (thing->player == nullptr || !(thing->player->cheats & CF_PREDICTING)))
P_CollidedWith(thing, BlockingMobj);
// Solid wall or thing // Solid wall or thing
if (!BlockingMobj || BlockingMobj->player || !thing->player) if (!BlockingMobj || BlockingMobj->player || !thing->player)
{ {
@ -2567,6 +2591,9 @@ bool P_TryMove(AActor *thing, const DVector2 &pos,
thing->SetXYZ(thingpos.X, thingpos.Y, pos.Z); thing->SetXYZ(thingpos.X, thingpos.Y, pos.Z);
if (!P_CheckPosition(thing, pos.XY(), true)) // check if some actor blocks us on the other side. (No line checks, because of the mess that'd create.) if (!P_CheckPosition(thing, pos.XY(), true)) // check if some actor blocks us on the other side. (No line checks, because of the mess that'd create.)
{ {
if (thing->BlockingMobj != nullptr && (thing->player == nullptr || !(thing->player->cheats && CF_PREDICTING)))
P_CollidedWith(thing, thing->BlockingMobj);
thing->SetXYZ(oldthingpos); thing->SetXYZ(oldthingpos);
thing->flags6 &= ~MF6_INTRYMOVE; thing->flags6 &= ~MF6_INTRYMOVE;
return false; return false;
@ -2744,6 +2771,7 @@ bool P_TryMove(AActor *thing, const DVector2 &pos,
pushline: pushline:
thing->flags6 &= ~MF6_INTRYMOVE; thing->flags6 &= ~MF6_INTRYMOVE;
thing->SetZ(oldz);
// [RH] Don't activate anything if just predicting // [RH] Don't activate anything if just predicting
if (thing->player && (thing->player->cheats & CF_PREDICTING)) if (thing->player && (thing->player->cheats & CF_PREDICTING))
@ -2751,7 +2779,6 @@ pushline:
return false; return false;
} }
thing->SetZ(oldz);
if (!(thing->flags&(MF_TELEPORT | MF_NOCLIP))) if (!(thing->flags&(MF_TELEPORT | MF_NOCLIP)))
{ {
int numSpecHitTemp; int numSpecHitTemp;

4
wadsrc/static/zscript/actors/actor.zs
View file

@ -510,6 +510,10 @@ class Actor : Thinker native
return true; return true;
} }
// Called in TryMove if the mover ran into another Actor. This isn't called on players
// if they're currently predicting. Guarantees collisions unlike CanCollideWith.
virtual void CollidedWith(Actor other, bool passive) {}
// Called by PIT_CheckThing to check if two actors actually can collide. // Called by PIT_CheckThing to check if two actors actually can collide.
virtual bool CanCollideWith(Actor other, bool passive) virtual bool CanCollideWith(Actor other, bool passive)
{ {