OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r67 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-24 14:26:06 +00:00
commit 9b5f9a1d70
8 changed files with 200 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_map.cpp
View file

@ -1670,11 +1670,19 @@ BOOL P_TryMove (AActor *thing, fixed_t x, fixed_t y,
{
floorz = MAX(thing->z, tmfloorz);
}
if (floorz - tmdropoffz > thing->MaxDropOffHeight &&
!(thing->flags2 & MF2_BLASTED))
{ // Can't move over a dropoff unless it's been blasted
thing->z = oldz;
return false;
if (!(thing->flags5&MF5_AVOIDINGDROPOFF))
{
if (floorz - tmdropoffz > thing->MaxDropOffHeight &&
!(thing->flags2 & MF2_BLASTED))
{ // Can't move over a dropoff unless it's been blasted
thing->z = oldz;
return false;
}
}
else
{
// special logic to move a monster off a dropoff
if (thing->dropoffz - tmdropoffz > thing->MaxDropOffHeight) return false;
}
}
if (thing->flags2 & MF2_CANTLEAVEFLOORPIC