zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Monsters with STAYMORPHED set would still unmorph.

Browse source 
SVN r4213 (trunk)
This commit is contained in:
Randy Heit 2013-04-09 22:45:20 +00:00
parent f7c55c0936
commit 2fb64108a7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/g_shared/a_morph.cpp
View file

@ -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;
}