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

Merge branch 'master' into portal

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-17 11:46:24 +01:00
commit 022ab95817
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/thingdef/thingdef_codeptr.cpp
View file

@ -3269,35 +3269,29 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIf)
// A_CountdownArg
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg)
{
PARAM_ACTION_PROLOGUE;
PARAM_INT(argnum);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); }
PARAM_INT(cnt);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); }
if (argnum >= 0 && argnum < (int)countof(self->args))
if (cnt<0 || cnt >= 5) return;
if (!self->args[cnt]--)
{
if (!self->args[argnum]--)
if (self->flags&MF_MISSILE)
{
if (self->flags & MF_MISSILE)
{
P_ExplodeMissile(self, NULL, NULL);
}
else if (self->flags & MF_SHOOTABLE)
{
P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
}
else
{
self->SetState(self->FindState(NAME_Death));
}
P_ExplodeMissile(self, NULL, NULL);
}
else if (self->flags&MF_SHOOTABLE)
{
P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
}
else
{
self->SetState(state);
}
}
return 0;
}
//============================================================================