zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into portal

This commit is contained in:
Christoph Oelckers 2016-02-17 11:46:24 +01:00
parent 10a3d75556 5a779cc1f4
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

18
src/thingdef/thingdef_codeptr.cpp
View File

@ -3269,35 +3269,29 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIf)
// A_CountdownArg // A_CountdownArg
// //
//=========================================================================== //===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg) DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg)
{ {
PARAM_ACTION_PROLOGUE; PARAM_ACTION_PROLOGUE;
PARAM_INT(argnum); PARAM_INT(cnt);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); } 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); P_ExplodeMissile(self, NULL, NULL);
} }
else if (self->flags & MF_SHOOTABLE) else if (self->flags&MF_SHOOTABLE)
{ {
P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED); P_DamageMobj(self, NULL, NULL, self->health, NAME_None, DMG_FORCED);
} }
else else
{
self->SetState(self->FindState(NAME_Death));
}
}
else
{ {
self->SetState(state); self->SetState(state);
} }
} }
return 0;
} }
//============================================================================ //============================================================================