From f2a27539d3643beca475bac6c569006ac22d93bf Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 5 Dec 2025 01:46:15 +0300 Subject: [PATCH] Experimental: remove mobj->old_x2, old_y2, etc fields --- src/p_mobj.h | 6 ------ src/p_user.c | 30 +++++++++++++++++------------- src/r_fps.cpp | 17 ----------------- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/src/p_mobj.h b/src/p_mobj.h index 781b86390..c3292bf70 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -285,7 +285,6 @@ typedef struct mobj_s // Info for drawing: position. fixed_t x, y, z; fixed_t old_x, old_y, old_z; // position interpolation - fixed_t old_x2, old_y2, old_z2; // More list: links in sector (if needed) struct mobj_s *bnext; @@ -297,7 +296,6 @@ typedef struct mobj_s // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation angle_t old_angle, old_pitch, old_roll; // orientation interpolation - angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -307,9 +305,7 @@ 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 @@ -320,7 +316,6 @@ typedef struct mobj_s //sloperollangle angle_t sloperoll, slopepitch; angle_t old_sloperoll, old_slopepitch; - angle_t old_sloperoll2, old_slopepitch2; angle_t pitch_sprite, roll_sprite; struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears @@ -395,7 +390,6 @@ typedef struct mobj_s fixed_t scale; fixed_t old_scale; // interpolation - fixed_t old_scale2; fixed_t destscale; fixed_t scalespeed; diff --git a/src/p_user.c b/src/p_user.c index 91b07a381..6c1150bcc 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1238,19 +1238,19 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) mobj->flags &= ~MF_DONTENCOREMAP; // Copy interpolation data :) - ghost->old_x = mobj->old_x2; - ghost->old_y = mobj->old_y2; - ghost->old_z = mobj->old_z2; - ghost->old_angle = (mobj->player ? mobj->player->old_frameangle2 : mobj->old_angle2); - ghost->old_pitch = mobj->old_pitch2; - ghost->old_roll = mobj->old_roll2; - 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; + ghost->old_x = mobj->old_x; + ghost->old_y = mobj->old_y; + ghost->old_z = mobj->old_z; + ghost->old_angle = (mobj->player ? mobj->player->old_frameangle : mobj->old_angle); + ghost->old_pitch = mobj->old_pitch; + ghost->old_roll = mobj->old_roll; + ghost->old_sloperoll = mobj->old_sloperoll; + ghost->old_slopepitch = mobj->old_slopepitch; + ghost->old_scale = mobj->old_scale; + ghost->old_spritexscale = mobj->old_spritexscale; + ghost->old_spriteyscale = mobj->old_spriteyscale; + ghost->old_spritexoffset = mobj->old_spritexoffset; + ghost->old_spriteyoffset = mobj->old_spriteyoffset; return ghost; } @@ -4968,6 +4968,10 @@ void P_PlayerThink(player_t *player) { UINT8 i; mobj_t *gmobj = P_SpawnGhostMobj(player->mo); + // Hack to preserve the look from vanilla, which uses position from second prev tic + gmobj->old_x -= player->mo->momx; + gmobj->old_y -= player->mo->momy; + gmobj->old_z -= player->mo->momz; gmobj->fuse = 2; if (leveltime & 1) diff --git a/src/r_fps.cpp b/src/r_fps.cpp index 98bfaf68b..728ac0133 100644 --- a/src/r_fps.cpp +++ b/src/r_fps.cpp @@ -763,23 +763,6 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) if (rendermode == render_none) return; - mobj->old_x2 = mobj->old_x; - mobj->old_y2 = mobj->old_y; - mobj->old_z2 = mobj->old_z; - mobj->old_angle2 = mobj->old_angle; - mobj->old_scale2 = mobj->old_scale; - - // rotation humor - mobj->old_pitch2 = mobj->old_pitch; - mobj->old_roll2 = mobj->old_roll; - mobj->old_slopepitch2 = mobj->old_slopepitch; - mobj->old_sloperoll2 = mobj->old_sloperoll; - - mobj->old_spritexscale2 = mobj->old_spritexscale; - mobj->old_spriteyscale2 = mobj->old_spriteyscale; - mobj->old_spritexoffset2 = mobj->old_spritexoffset; - mobj->old_spriteyoffset2 = mobj->old_spriteyoffset; - mobj->old_x = mobj->x; mobj->old_y = mobj->y; mobj->old_z = mobj->z;