OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added ACS CheckFlag function.

Browse source
This commit is contained in:
Christoph Oelckers 2013-08-12 22:38:52 +02:00
commit 61c94648dc
4 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/thingdef/thingdef_codeptr.cpp
View file

@ -3777,32 +3777,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckFlag)
COPY_AAPTR_NOT_NULL(self, owner, checkpointer);
const char *dot = strchr (flagname, '.');
FFlagDef *fd;
const PClass *cls = owner->GetClass();
if (dot != NULL)
if (CheckActorFlag(owner, flagname))
{
FString part1(flagname, dot-flagname);
fd = FindFlag (cls, part1, dot+1);
ACTION_JUMP(jumpto);
}
else
{
fd = FindFlag (cls, flagname, NULL);
}
if (fd != NULL)
{
if (CheckActorFlag(owner, fd))
{
ACTION_JUMP(jumpto);
}
}
else
{
Printf("Unknown flag '%s' in '%s'\n", flagname, cls->TypeName.GetChars());
}
}