From cc4d780371e81a8668292b61c538e0ca49b49d01 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Mon, 24 Oct 2016 13:52:36 +0100 Subject: [PATCH] Making things more scale-friendly (but it's not perfect...) --- src/p_mobj.c | 1 - src/p_user.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 31e0d477c..5d1af9c45 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6819,7 +6819,6 @@ void P_MobjThinker(mobj_t *mobj) whoosh->destscale = whoosh->scale<<1; whoosh->fuse = 10; whoosh->flags |= MF_NOCLIPHEIGHT; - whoosh->height = 42*FRACUNIT; mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh } case MT_FLAMEAURA_ORB: diff --git a/src/p_user.c b/src/p_user.c index 55d2ad544..1514fdef6 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -6994,7 +6994,7 @@ static void P_MovePlayer(player_t *player) { player->pflags |= PF_THOKKED|PF_SHIELDABILITY; #if 1 // almost imperceptible hop for the purposes of aligning with the aura for as long as possible - P_SetObjectMomZ(player->mo, -4*P_GetMobjGravity(player->mo), false); + P_SetObjectMomZ(player->mo, FixedDiv(-4*P_GetMobjGravity(player->mo), player->mo->scale), false); #else player->mo->momz = // intentionally carries to post-endif line as multiple-assignment #endif