From cd60ee1188c4d46d99d646fa949aaa994ea22b9a Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 29 Apr 2025 21:43:18 +0200 Subject: [PATCH] fix ghost mobj spritescale and offset interpolation had this laying around in lugstuff since ages lol --- src/p_mobj.h | 4 ++++ src/p_user.c | 4 ++++ src/r_fps.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/src/p_mobj.h b/src/p_mobj.h index 0b380786b..733153017 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -293,7 +293,9 @@ typedef struct mobj_s fixed_t spritexscale, spriteyscale; fixed_t spritexoffset, spriteyoffset; fixed_t old_spritexscale, old_spriteyscale; + fixed_t old_spritexscale2, old_spriteyscale2; fixed_t old_spritexoffset, old_spriteyoffset; + fixed_t old_spritexoffset2, old_spriteyoffset2; INT16 lightlevel; // Add to sector lightlevel, -255 - 255 fixed_t realxscale, realyscale; // funn-E streeetch @@ -447,7 +449,9 @@ typedef struct precipmobj_s fixed_t spritexscale, spriteyscale; fixed_t spritexoffset, spriteyoffset; fixed_t old_spritexscale, old_spriteyscale; + fixed_t old_spritexscale2, old_spriteyscale2; fixed_t old_spritexoffset, old_spriteyoffset; + fixed_t old_spritexoffset2, old_spriteyoffset2; INT16 lightlevel; // Add to sector lightlevel, -255 - 255 fixed_t realxscale, realyscale; // funn-E streeetch diff --git a/src/p_user.c b/src/p_user.c index 31e6a52ef..d9f398949 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1219,6 +1219,10 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->old_sloperoll = mobj->old_sloperoll2; ghost->old_slopepitch = mobj->old_slopepitch2; ghost->old_scale = mobj->old_scale2; + ghost->old_spritexscale = mobj->old_spritexscale2; + ghost->old_spriteyscale = mobj->old_spriteyscale2; + ghost->old_spritexoffset = mobj->old_spritexoffset2; + ghost->old_spriteyoffset = mobj->old_spriteyoffset2; return ghost; } diff --git a/src/r_fps.c b/src/r_fps.c index 9827a65f2..68579282a 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -800,6 +800,11 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->old_spritexoffset = mobj->spritexoffset; mobj->old_spriteyoffset = mobj->spriteyoffset; + mobj->old_spritexscale2 = mobj->old_spritexscale; + mobj->old_spriteyscale2 = mobj->old_spriteyscale; + mobj->old_spritexoffset2 = mobj->old_spritexoffset; + mobj->old_spriteyoffset2 = mobj->old_spriteyoffset; + if (mobj->player) { mobj->player->old_frameangle2 = mobj->player->old_frameangle;