From f1dff6c9d3c6c32c3d6721d010b6f1957b121c4e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 2 Jul 2013 22:01:54 +0200 Subject: [PATCH] - fixed: The new XDeath code forgot to move the assignment of the flags4 variable. Also renamed the variable to avoid conflicts. --- src/p_interaction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index cc4c9aece..43499d353 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -658,7 +658,8 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags) FState *diestate = NULL; int gibhealth = GibHealth(); - bool extremelydead = ((health < gibhealth || flags4 & MF4_EXTREMEDEATH) && !(flags4 & MF4_NOEXTREMEDEATH)); + int iflags4 = inflictor == NULL ? 0 : inflictor->flags4; + bool extremelydead = ((health < gibhealth || iflags4 & MF4_EXTREMEDEATH) && !(iflags4 & MF4_NOEXTREMEDEATH)); // Special check for 'extreme' damage type to ensure that it gets recorded properly as an extreme death for subsequent checks. if (DamageType == NAME_Extreme) @@ -703,7 +704,6 @@ void AActor::Die (AActor *source, AActor *inflictor, int dmgflags) } if (diestate == NULL) { - int flags4 = inflictor == NULL ? 0 : inflictor->flags4; // Don't pass on a damage type this actor cannot handle. // (most importantly, prevent barrels from passing on ice damage.)