From 0cf2ae0127a5b1286d23cc215017f2760e91e244 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 31 Oct 2006 15:24:22 +0000 Subject: [PATCH] Forgot to save the last change before committing. SVN r369 (trunk) --- src/p_interaction.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 00c151448a..a2ad10d2dd 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -634,8 +634,11 @@ void AActor::Die (AActor *source, AActor *inflictor) int gibhealth = -abs(GetClass()->Meta.GetMetaInt (AMETA_GibHealth, gameinfo.gametype == GAME_Doom ? -GetDefault()->health : -GetDefault()->health/2)); - DamageType =NAME_None; // Don't pass on a damage type this actor cannot handle - // (most importantly prevent barrels from passing on ice damage) + // Don't pass on a damage type this actor cannot handle + // (most importantly prevent barrels from passing on ice damage) + // Massacre must be preserved though. + if (DamageType != NAME_Massacre) DamageType =NAME_None; + if ((health