OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed merge conflicts.

Browse source
This commit is contained in:
MajorCooke 2016-02-02 18:26:20 -06:00
commit a1c1de9edb
11 changed files with 59 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/thingdef/thingdef_codeptr.cpp
View file

@ -6028,6 +6028,33 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipMax)
self->RipLevelMax = max;
}
//===========================================================================
//
// A_SetChaseThreshold(int threshold, bool def, int ptr)
//
// Sets the current chase threshold of the actor (pointer). If def is true,
// changes the default threshold which the actor resets to once it switches
// targets and doesn't have the +QUICKTORETALIATE flag.
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetChaseThreshold)
{
ACTION_PARAM_START(3);
ACTION_PARAM_INT(threshold, 0);
ACTION_PARAM_BOOL(def, 1);
ACTION_PARAM_INT(ptr, 2);
AActor *mobj = COPY_AAPTR(self, ptr);
if (!mobj)
{
ACTION_SET_RESULT(false);
return;
}
if (def)
mobj->DefThreshold = (threshold >= 0) ? threshold : 0;
else
mobj->threshold = (threshold >= 0) ? threshold : 0;
}
//==========================================================================
//
// A_CheckProximity(jump, classname, distance, count, flags, ptr)