From 4b04b944148c08579f1721290cead4c314219204 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Feb 2010 23:59:17 +0000 Subject: [PATCH] - fixed: The monster pack's Afrit no longer worked. SVN r2165 (trunk) --- src/p_mobj.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 13c75eb991..9a0f9c6926 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -2232,7 +2232,9 @@ void P_ZMovement (AActor *mo, fixed_t oldfloorz) // old code for boss cube disabled //if ((mo->flags & MF_MISSILE) && (!(gameinfo.gametype & GAME_DoomChex) || !(mo->flags & MF_NOCLIP))) - if (mo->flags & MF_MISSILE) + // We can't remove this completely because it was abused by some DECORATE definitions + // (e.g. the monster pack's Afrit) + if ((mo->flags & MF_MISSILE) && ((mo->flags & MF_NOGRAVITY) || !(mo->flags & MF_NOCLIP))) { mo->z = mo->floorz; if (mo->BounceFlags & BOUNCE_Floors)