zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Skip the MF2_PASSMOBJ height checks in PIT_CheckThing() for ripper missiles.

Browse source 
SVN r4135 (trunk)
This commit is contained in:
Randy Heit 2013-02-14 04:40:29 +00:00
parent 70fa9e7b84
commit 0a2e42c090
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_map.cpp
View file

@ -905,13 +905,17 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
// you can use a scrolling floor to move scenery items underneath a bridge. // you can use a scrolling floor to move scenery items underneath a bridge.
if ((tm.thing->flags2 & MF2_PASSMOBJ || thing->flags4 & MF4_ACTLIKEBRIDGE) && !(i_compatflags & COMPATF_NO_PASSMOBJ)) if ((tm.thing->flags2 & MF2_PASSMOBJ || thing->flags4 & MF4_ACTLIKEBRIDGE) && !(i_compatflags & COMPATF_NO_PASSMOBJ))
{ // check if a mobj passed over/under another object { // check if a mobj passed over/under another object
if (tm.thing->flags3 & thing->flags3 & MF3_DONTOVERLAP) if (!(tm.thing->flags & MF_MISSILE) ||
{ // Some things prefer not to overlap each other, if possible !(tm.thing->flags2 & MF2_RIP) ||
return unblocking; (thing->flags5 & MF5_DONTRIP) ||
} (tm.thing->flags6 & MF6_NOBOSSRIP) && (thing->flags2 & MF2_BOSS))
if ((tm.thing->z >= topz) || (tm.thing->z + tm.thing->height <= thing->z))
{ {
return true; if (tm.thing->flags3 & thing->flags3 & MF3_DONTOVERLAP)
{ // Some things prefer not to overlap each other, if possible
return unblocking;
}
if ((tm.thing->z >= topz) || (tm.thing->z + tm.thing->height <= thing->z))
return true;
} }
} }
@ -2878,7 +2882,7 @@ extern FRandom pr_bounce;
bool P_BounceActor (AActor *mo, AActor *BlockingMobj, bool ontop) bool P_BounceActor (AActor *mo, AActor *BlockingMobj, bool ontop)
{ {
if (mo && BlockingMobj && ((mo->BounceFlags & BOUNCE_AllActors) if (mo && BlockingMobj && ((mo->BounceFlags & BOUNCE_AllActors)
|| ((mo->flags & MF_MISSILE) && (BlockingMobj->flags2 & MF2_REFLECTIVE)) || ((mo->flags & MF_MISSILE) && (!(mo->flags2 & MF2_RIP) || (BlockingMobj->flags5 & MF5_DONTRIP) || ((mo->flags6 & MF6_NOBOSSRIP) && (BlockingMobj->flags2 & MF2_BOSS))) && (BlockingMobj->flags2 & MF2_REFLECTIVE))
|| ((BlockingMobj->player == NULL) && (!(BlockingMobj->flags3 & MF3_ISMONSTER))) || ((BlockingMobj->player == NULL) && (!(BlockingMobj->flags3 & MF3_ISMONSTER)))
)) ))
{ {