From c98497e6c5e97345e5e1839439f4d88295e41d80 Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Sat, 11 Jan 2020 10:14:20 -0500 Subject: [PATCH] More breakage --- src/p_map.c | 25 ------------------------- src/p_maputl.h | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/p_map.c b/src/p_map.c index d1d175f8a..266c5e579 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -3424,31 +3424,6 @@ boolean P_CheckMoveBlocked(line_t *li, mobj_t *mo) return true; } - if (!(mo->flags & MF_MISSILE)) - { - if (li->flags & ML_IMPASSIBLE) - return false; - - if ((mo->flags & (MF_ENEMY|MF_BOSS)) && li->flags & ML_BLOCKMONSTERS) - return false; - } - - // set openrange, opentop, openbottom - P_LineOpening(li, mo); - - if (openrange < mo->height) - return false; // doesn't fit - - if (opentop - mo->z < mo->height) - return false; // mobj is too high - - if (openbottom - mo->z > FixedMul(MAXSTEPMOVE, mo->scale)) - return false; // too big a step up - - // this line doesn't block movement - return true; -} - // // PTR_SlideTraverse // diff --git a/src/p_maputl.h b/src/p_maputl.h index 16cfc834e..d73dae5e6 100644 --- a/src/p_maputl.h +++ b/src/p_maputl.h @@ -60,7 +60,7 @@ extern pslope_t *opentopslope, *openbottomslope; #endif extern ffloor_t *openfloorrover, *openceilingrover; -void P_LineOpening(line_t *plinedef, mobj_t *mobj); +void P_LineOpening(line_t *linedef, mobj_t *mobj); boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean(*func)(line_t *)); boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean(*func)(mobj_t *));