SVN r52 (trunk)

This commit is contained in:
Christoph Oelckers 2006-04-17 16:04:27 +00:00
commit d8500150f3
7 changed files with 25 additions and 8 deletions

View file

@ -1661,7 +1661,7 @@ BOOL P_TryMove (AActor *thing, fixed_t x, fixed_t y,
}
// killough 3/15/98: Allow certain objects to drop off
if (!dropoff && !(thing->flags & (MF_DROPOFF|MF_FLOAT|MF_MISSILE)))
if ((!dropoff && !(thing->flags & (MF_DROPOFF|MF_FLOAT|MF_MISSILE))) || (thing->flags5&MF5_NODROPOFF))
{
fixed_t floorz = tmfloorz;
// [RH] If the thing is standing on something, use its current z as the floorz.