- Fixed: PCD_MORPHACTOR and P_MorphMonster() needed NULL pointer checks.

SVN r4141 (trunk)
This commit is contained in:
Randy Heit 2013-02-19 01:51:07 +00:00
commit 87dbfb68e9
2 changed files with 7 additions and 18 deletions

View file

@ -366,7 +366,7 @@ bool P_MorphMonster (AActor *actor, const PClass *spawntype, int duration, int s
{
AMorphedMonster *morphed;
if (actor->player || spawntype == NULL ||
if (actor == NULL || actor->player || spawntype == NULL ||
actor->flags3 & MF3_DONTMORPH ||
!(actor->flags3 & MF3_ISMONSTER) ||
!spawntype->IsDescendantOf (RUNTIME_CLASS(AMorphedMonster)))