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

- Added CBF_DROPOFF to A_CheckBlock. Checks for actors stuck in tall ledges or dropoffs.

Browse source
This commit is contained in:
MajorCooke 2016-01-31 09:45:41 -06:00
parent 219b6f7c5d
commit eb2829ad5e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_codeptr.cpp
View file

@ -6200,6 +6200,7 @@ enum CBF
CBF_SETMASTER = 1 << 2, //^ but with master. CBF_SETMASTER = 1 << 2, //^ but with master.
CBF_SETTRACER = 1 << 3, //^ but with tracer. CBF_SETTRACER = 1 << 3, //^ but with tracer.
CBF_SETONPTR = 1 << 4, //Sets the pointer change on the actor doing the checking instead of self. CBF_SETONPTR = 1 << 4, //Sets the pointer change on the actor doing the checking instead of self.
CBF_DROPOFF = 1 << 5, //Check for dropoffs.
}; };
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckBlock) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckBlock)
@ -6219,7 +6220,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckBlock)
} }
//Nothing to block it so skip the rest. //Nothing to block it so skip the rest.
if (P_TestMobjLocation(mobj)) return; bool checker = (flags & CBF_DROPOFF) ? P_CheckMove(mobj, mobj->X(), mobj->Y()) : P_TestMobjLocation(mobj);
if (checker) return;
if (mobj->BlockingMobj) if (mobj->BlockingMobj)
{ {

1
wadsrc/static/actors/constants.txt
View file

@ -516,6 +516,7 @@ enum
CBF_SETMASTER = 1 << 2, //^ but with master. CBF_SETMASTER = 1 << 2, //^ but with master.
CBF_SETTRACER = 1 << 3, //^ but with tracer. CBF_SETTRACER = 1 << 3, //^ but with tracer.
CBF_SETONPTR = 1 << 4, //Sets the pointer change on the actor doing the checking instead of self. CBF_SETONPTR = 1 << 4, //Sets the pointer change on the actor doing the checking instead of self.
CBF_DROPOFF = 1 << 5, //Check for dropoffs.
}; };
enum enum