From 0246f2bf4de58b3df3e45c15c4c962f0e6e49228 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 30 Jan 2010 13:08:52 +0000 Subject: [PATCH] - fixed: Being resurrected by an Arch Vile did not restore flags5 and flags6 to the defaults. SVN r2142 (trunk) --- src/actor.h | 1 - src/p_enemy.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/actor.h b/src/actor.h index d870e8df2..6e8af2498 100644 --- a/src/actor.h +++ b/src/actor.h @@ -909,7 +909,6 @@ public: return GetClass()->ActorInfo->FindState(2, names, exact); } - bool HasSpecialDeathStates () const; }; diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index 4b80d5b68..eff234af9 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -2579,6 +2579,8 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates) corpsehit->flags2 = info->flags2; corpsehit->flags3 = info->flags3; corpsehit->flags4 = info->flags4; + corpsehit->flags5 = info->flags5; + corpsehit->flags6 = info->flags6; corpsehit->health = info->health; corpsehit->target = NULL; corpsehit->lastenemy = NULL;