OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Randy Heit 2016-02-18 22:05:40 -06:00
commit fbbaae781b
11 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/thingdef/thingdef_codeptr.cpp
View file

@ -3210,28 +3210,23 @@ 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 0;
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
{