This commit is contained in:
hayaunderscore committed 2023-08-27 15:18:12 +08:00
1 parent 00d383cc28
commit 9f4df6b80d
2 files changed
+6 -6

No files matched your search

+2 -2
View File
@@ -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) {
+4 -4
View File
@@ -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);