From 6574f822a46fb63bca339300779ad0aa1de544b3 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 23 May 2022 02:57:20 -0400 Subject: [PATCH] Fix bobspeed + menu z offset --- src/k_follower.c | 2 +- src/m_menu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_follower.c b/src/k_follower.c index 25e0c5814..6b9b20c08 100644 --- a/src/k_follower.c +++ b/src/k_follower.c @@ -245,7 +245,7 @@ void K_HandleFollower(player_t *player) // not stolen from k_kart I swear!! { const fixed_t pi = (22<> ANGLETOFINESHIFT) & FINEMASK)); + fixed_t sine = FixedMul(fl.bobamp, FINESINE(((FixedMul(8 * pi, fl.bobspeed) * leveltime) >> ANGLETOFINESHIFT) & FINEMASK)); sz += FixedMul(player->mo->scale, sine) * P_MobjFlip(player->mo); } diff --git a/src/m_menu.c b/src/m_menu.c index d9d229cf2..e1a6a90c4 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9668,10 +9668,10 @@ static void M_DrawSetupMultiPlayerMenu(void) follower_t fl = followers[setupm_fakefollower]; // shortcut for our sanity // smooth floating, totally not stolen from rocket sneakers. const fixed_t pi = (22<>ANGLETOFINESHIFT) & FINEMASK)); + fixed_t sine = FixedMul(fl.bobamp, FINESINE((((8 * pi * fl.bobspeed) * followertimer)>>ANGLETOFINESHIFT) & FINEMASK)); UINT8 *colormap = R_GetTranslationColormap(-1, setupm_fakecolor->color, 0); - V_DrawFixedPatch((mx+65)*FRACUNIT, (my+131-fl.zoffs)*FRACUNIT+sine, fl.scale, flags, patch, colormap); + V_DrawFixedPatch((mx+65)*FRACUNIT, ((my+131)*FRACUNIT)-fl.zoffs+sine, fl.scale, flags, patch, colormap); Z_Free(colormap); } }