- Dropped items with the DONTGIB flag set will no longer be destroyed by crushers.

SVN r4215 (trunk)
This commit is contained in:
Randy Heit 2013-04-16 17:55:17 +00:00
commit a5d770b433
4 changed files with 30 additions and 9 deletions

View file

@ -998,7 +998,7 @@ bool AActor::Grind(bool items)
// ZDoom behavior differs from standard as crushed corpses cannot be raised.
// The reason for the change was originally because of a problem with players,
// see rh_log entry for February 21, 1999. Don't know if it is still relevant.
if (state == NULL // Only use the default crushed state if:
if (state == NULL // Only use the default crushed state if:
&& !(flags & MF_NOBLOOD) // 1. the monster bleeeds,
&& (i_compatflags & COMPATF_CORPSEGIBS) // 2. the compat setting is on,
&& player == NULL) // 3. and the thing isn't a player.
@ -1086,13 +1086,6 @@ bool AActor::Grind(bool items)
return false; // keep checking
}
// crunch dropped items
if (flags & MF_DROPPED)
{
if (items) Destroy (); // Only destroy dropped items if wanted
return false; // keep checking
}
// killough 11/98: kill touchy things immediately
if (flags6 & MF6_TOUCHY && (flags6 & MF6_ARMED || IsSentient()))
{