From 0d82b075b0e1b799b22c81b45a7fa967e1efa494 Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 24 May 2022 18:09:40 +0100 Subject: [PATCH 1/2] Fix Grow on Trick Panels sending you to ridiculous heights. --- src/k_kart.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index ef94b4721..ade502c07 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5615,7 +5615,6 @@ static void K_DoShrink(player_t *user) void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound) { - const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale); fixed_t thrust = 0; if (mo->player && mo->player->spectator) @@ -5656,7 +5655,7 @@ void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound) //CONS_Printf("Got boost: %d%\n", mo->player->trickboostpower*100 / FRACUNIT); } - mo->momz = FixedMul(thrust, vscale); + mo->momz = FixedMul(thrust, mapobjectscale); if (mo->eflags & MFE_UNDERWATER) { From bf6d257cfb3acaf8173ff6c5787526ebc13fb95f Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 24 May 2022 18:41:13 +0100 Subject: [PATCH 2/2] Prevent rings from suddenly growing in size when a Grow player interacts with them, to match how using rings while grown or shrunk have them at mapobjectscale. --- src/p_enemy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 65f00e116..341c24164 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -4018,7 +4018,7 @@ void A_AttractChase(mobj_t *actor) { fixed_t dist = (4*actor->target->scale) * (16 - actor->extravalue1); - P_SetScale(actor, (actor->destscale = actor->target->scale - ((actor->target->scale/14) * actor->extravalue1))); + P_SetScale(actor, (actor->destscale = mapobjectscale - ((mapobjectscale/14) * actor->extravalue1))); actor->z = actor->target->z; K_MatchGenericExtraFlags(actor, actor->target); P_MoveOrigin(actor,