zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a vector to CanCrossLine to indicate the next position the actor will be in if the move succeeds.

This commit is contained in:
Major Cooke 2020-09-27 17:00:47 -05:00 committed by Rachael Alexanderson
parent bb862098ea
commit 992141d8e3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/playsim/p_map.cpp
View File

@ -163,7 +163,7 @@ bool P_CanCollideWith(AActor *tmthing, AActor *thing)
// If false, the line blocks them.
//==========================================================================
bool P_CanCrossLine(AActor *mo, line_t *line, int side)
bool P_CanCrossLine(AActor *mo, line_t *line, int side, DVector3 next)
{
static unsigned VIndex = ~0u;
if (VIndex == ~0u)
@ -172,7 +172,7 @@ bool P_CanCrossLine(AActor *mo, line_t *line, int side)
assert(VIndex != ~0u);
}
VMValue params[4] = { mo, line, side, false };
VMValue params[] = { mo, line, side, next.X, next.Y, next.Z, false };
VMReturn ret;
int retval;
ret.IntAt(&retval);
@ -181,7 +181,7 @@ bool P_CanCrossLine(AActor *mo, line_t *line, int side)
VMFunction *func = clss->Virtuals.Size() > VIndex ? clss->Virtuals[VIndex] : nullptr;
if (func != nullptr)
{
VMCall(func, params, 4, &ret, 1);
VMCall(func, params, countof(params), &ret, 1);
return retval;
}
return true;
@ -985,7 +985,7 @@ bool PIT_CheckLine(FMultiBlockLinesIterator &mit, FMultiBlockLinesIterator::Chec
}
}
if (!P_CanCrossLine(tm.thing, ld, P_PointOnLineSide(cres.Position, ld)))
if (!P_CanCrossLine(tm.thing, ld, P_PointOnLineSide(cres.Position, ld), tm.pos))
{
if (wasfit)
tm.thing->BlockingLine = ld;

2
wadsrc/static/zscript/actors/actor.zs
View File

@ -502,7 +502,7 @@ class Actor : Thinker native
}
// Called by PIT_CheckLine to check if an actor can cross a line.
virtual bool CanCrossLine(Line crossing, int side)
virtual bool CanCrossLine(Line crossing, int side, Vector3 next)
{
return true;
}