Merge branch 'maint'

This commit is contained in:
Christoph Oelckers 2013-07-30 16:53:00 +02:00
commit 4eb6f74e36

View file

@ -744,9 +744,12 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags)
{ {
SetState (diestate); SetState (diestate);
tics -= pr_killmobj() & 3; if (tics > 1)
if (tics < 1) {
tics = 1; tics -= pr_killmobj() & 3;
if (tics < 1)
tics = 1;
}
} }
else else
{ {