SVN r49 (trunk)

This commit is contained in:
Christoph Oelckers 2006-04-16 13:29:50 +00:00
commit da51ac7446
37 changed files with 212 additions and 94 deletions

View file

@ -411,7 +411,7 @@ void AActor::Die (AActor *source, AActor *inflictor)
if (source && source->player)
{
if (flags & MF_COUNTKILL)
if (CountsAsKill())
{ // count for intermission
source->player->killcount++;
level.killed_monsters++;
@ -553,7 +553,7 @@ void AActor::Die (AActor *source, AActor *inflictor)
}
}
}
else if (!multiplayer && (flags & MF_COUNTKILL))
else if (!multiplayer && CountsAsKill())
{
// count all monster deaths,
// even those caused by other monsters