From 9f4df6b80d7e6596c225e96a96eb67b5aed879a8 Mon Sep 17 00:00:00 2001 From: hayaunderscore Date: Sun, 27 Aug 2023 15:18:12 +0800 Subject: [PATCH] nuh uh --- src/k_kart.c | 4 ++-- src/r_fps.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 3661928d0..810f24993 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3047,7 +3047,7 @@ static void K_StretchPlayerGravity(player_t *p) static void K_QuiteSaltyHop(player_t *p) { // what the fuck is this haya - fixed_t mos = mapobjectscale; + fixed_t mos = FRACUNIT; // doesnt work correctly if it isnt :/ // ready? if (!p->kartstuff[k_jmp]) { @@ -3074,7 +3074,7 @@ static void K_QuiteSaltyHop(player_t *p) p->mo->salty_zoffset += p->mo->salty_momz; p->mo->salty_momz -= (mos*3/2); } else { - p->mo->salty_zoffset *= 49/50; + p->mo->salty_zoffset *= (49/50)*mos; p->mo->salty_momz = 0; } if (p->mo->salty_zoffset <= 0) { diff --git a/src/r_fps.c b/src/r_fps.c index ce7d08a7a..67865d016 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -293,13 +293,13 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac); out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac); out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac); - //out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac); - //out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac); + out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac); + out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac); // Sprite offsets are not interpolated until we have a way to interpolate them explicitly in Lua. // It seems existing mods visually break more often than not if it is interpolated. - out->spritexoffset = mobj->spritexoffset; - out->spriteyoffset = mobj->spriteyoffset; + //out->spritexoffset = mobj->spritexoffset; + //out->spriteyoffset = mobj->spriteyoffset; out->subsector = R_PointInSubsector(out->x, out->y);