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 12:37:11 +01:00
commit bd09664d85
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_codeptr.cpp
View file

@ -3276,7 +3276,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg)
PARAM_INT(cnt);
PARAM_STATE_OPT(state) { state = self->FindState(NAME_Death); }
if (cnt<0 || cnt >= 5) return;
if (cnt<0 || cnt >= 5) return 0;
if (!self->args[cnt]--)
{
if (self->flags&MF_MISSILE)
@ -3292,6 +3292,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CountdownArg)
self->SetState(state);
}
}
return 0;
}
//============================================================================