- Fixed: P_TestMobjZ() should not let missile shooters block their missiles.

SVN r3571 (trunk)
This commit is contained in:
Randy Heit 2012-04-19 02:50:43 +00:00
parent 9c1e03a21b
commit 86842bc1da
2 changed files with 4 additions and 2 deletions

View file

@ -1561,6 +1561,10 @@ bool P_TestMobjZ (AActor *actor, bool quick, AActor **pOnmobj)
{ // Don't clip against self { // Don't clip against self
continue; continue;
} }
if ((actor->flags & MF_MISSILE) && thing == actor->target)
{ // Don't clip against whoever shot the missile.
continue;
}
if (actor->z > thing->z+thing->height) if (actor->z > thing->z+thing->height)
{ // over thing { // over thing
continue; continue;

View file

@ -1884,8 +1884,6 @@ fixed_t P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
goto explode; goto explode;
} }
// Reflect the missile along angle // Reflect the missile along angle
mo->angle = angle; mo->angle = angle;
angle >>= ANGLETOFINESHIFT; angle >>= ANGLETOFINESHIFT;