zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-08 21:01:46 +01:00
commit 0a7b17c469
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/thingdef/thingdef_codeptr.cpp
View file

@ -6419,8 +6419,8 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckProximity)
PARAM_CLASS(classname, AActor); PARAM_CLASS(classname, AActor);
PARAM_FIXED(distance); PARAM_FIXED(distance);
PARAM_INT_OPT(count) { count = 1; } PARAM_INT_OPT(count) { count = 1; }
PARAM_INT(flags) { flags = 0; } PARAM_INT_OPT(flags) { flags = 0; }
PARAM_INT(ptr) { ptr = AAPTR_DEFAULT; } PARAM_INT_OPT(ptr) { ptr = AAPTR_DEFAULT; }
ACTION_SET_RESULT(false); //No inventory chain results please. ACTION_SET_RESULT(false); //No inventory chain results please.
@ -6455,7 +6455,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckProximity)
//Check inheritance for the classname. Taken partly from CheckClass DECORATE function. //Check inheritance for the classname. Taken partly from CheckClass DECORATE function.
if (flags & CPXF_ANCESTOR) if (flags & CPXF_ANCESTOR)
{ {
if (!(mo->GetClass()->IsAncestorOf(classname))) if (!(mo->IsKindOf(classname)))
continue; continue;
} }
//Otherwise, just check for the regular class name. //Otherwise, just check for the regular class name.