From 25e5ac7e2aeef6bc55cceeea92c5ba5f680ecfcf Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 27 Mar 2015 18:29:57 +0100 Subject: [PATCH] - fixed: CheckForResurrection should check whether the active translation is actually a blood translation before resetting it, not assuming that GenericCrush is a single state with infinite duration. --- src/p_enemy.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index be0646d4b..540aa119e 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -44,6 +44,7 @@ #include "thingdef/thingdef.h" #include "d_dehacked.h" #include "g_level.h" +#include "r_data/r_translate.h" #include "teaminfo.h" #include "gi.h" @@ -2615,7 +2616,7 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates) S_Sound(corpsehit, CHAN_BODY, "vile/raise", 1, ATTN_IDLE); info = corpsehit->GetDefault(); - if (corpsehit->state == corpsehit->FindState(NAME_GenericCrush)) + if (GetTranslationType(corpsehit->Translation) == TRANSLATION_Blood) { corpsehit->Translation = info->Translation; // Clean up bloodcolor translation from crushed corpses }