diff --git a/src/p_mobj.h b/src/p_mobj.h index 566fc3164..018a81236 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -294,6 +294,7 @@ 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_z2; // ok guess we need that... // More list: links in sector (if needed) struct mobj_s *bnext; diff --git a/src/p_user.c b/src/p_user.c index 6af203c75..4c5fff171 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1232,7 +1232,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) // old_x - mobj->momx - hack to preserve vanilla look ghost->old_x = mobj->old_x - mobj->momx; ghost->old_y = mobj->old_y - mobj->momy; - ghost->old_z = mobj->old_z - mobj->momz; + ghost->old_z = mobj->old_z2; // Slopes..... ghost->old_angle = (mobj->player ? mobj->player->old_frameangle : mobj->old_angle); ghost->old_pitch = mobj->old_pitch; ghost->old_roll = mobj->old_roll; diff --git a/src/r_fps.cpp b/src/r_fps.cpp index 9c352b243..a9b24f876 100644 --- a/src/r_fps.cpp +++ b/src/r_fps.cpp @@ -724,6 +724,10 @@ void R_AddMobjInterpolator(mobj_t *mobj) interpolated_mobjs.push_back(mobj); + // Maybe not the best place for it, but for first tic this old_z is 0, + // so when R_ResetMobjInterpolationState is called old_z2 will be set to 0 + mobj->old_z = mobj->z; + R_ResetMobjInterpolationState(mobj); mobj->resetinterp = true; } @@ -765,6 +769,8 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) if (rendermode == render_none) return; + mobj->old_z2 = mobj->old_z; + mobj->old_x = mobj->x; mobj->old_y = mobj->y; mobj->old_z = mobj->z;