From 2fb64108a7dfc6ec96a7ceb757b75d2a4030139f Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 9 Apr 2013 22:45:20 +0000 Subject: [PATCH] - Fixed: Monsters with STAYMORPHED set would still unmorph. SVN r4213 (trunk) --- src/g_shared/a_morph.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/g_shared/a_morph.cpp b/src/g_shared/a_morph.cpp index 211718ae8..58781f05a 100644 --- a/src/g_shared/a_morph.cpp +++ b/src/g_shared/a_morph.cpp @@ -428,7 +428,8 @@ bool P_UndoMonsterMorph (AMorphedMonster *beast, bool force) if (beast->UnmorphTime == 0 || beast->UnmorphedMe == NULL || - beast->flags3 & MF3_STAYMORPHED) + beast->flags3 & MF3_STAYMORPHED || + beast->UnmorphedMe->flags3 & MF3_STAYMORPHED) { return false; }