From 72b592888ff2324e2dd279e2afa9a2c522a42e8d Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sat, 11 Aug 2018 20:49:16 -0400 Subject: [PATCH] Line fixes for visual element positioning # Conflicts: # src/p_mobj.c --- src/p_mobj.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index de2ed16ac..66608332c 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10573,15 +10573,13 @@ ML_EFFECT4 : Don't clip inside the ground boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL); boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA); - fixed_t droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0); - fixed_t dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0); - INT16 timelimit = mthing->angle; fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT; fixed_t oldheight = mobj->height; // if you want to use parameter for something else, do this instead: // timelimit = mthing->angle & 0xFFF; hitboxheight = (mthing->extrainfo >> 12) * 32 * FRACUNIT; - fixed_t dronemanoffset, goaloffset, sparkleoffset; + fixed_t oldheight = mobj->height; + fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff; if (mthing->angle > 0) mobj->health = timelimit; @@ -10591,6 +10589,9 @@ ML_EFFECT4 : Don't clip inside the ground else mobj->height = mobjinfo[MT_NIGHTSDRONE].height; + droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0); + dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0); + if (flip && mobj->height != oldheight) P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight));