From 5d71043df60b1bf6cc20f2a0f8ec6d104b92751d Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 21:18:26 +0100 Subject: [PATCH] some mobj interp fixes copy pasted from RR thx --- src/k_kart.c | 26 ++++++++++++++++++-------- src/p_mobj.c | 9 ++++++++- src/p_saveg.c | 14 +++++++------- src/p_telept.c | 1 + src/p_user.c | 11 +++++++---- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index ad68305c9..cb2a1e140 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4060,15 +4060,19 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter) mine->floorz = thismine->floorz; mine->ceilingz = thismine->ceilingz; - //Since we aren't using P_KillMobj, we need to clean up the hnext reference - { - P_SetTarget(&thismine->target->hnext, NULL); //target is the player who owns the mine - thismine->target->player->kartstuff[k_bananadrag] = 0; - thismine->target->player->kartstuff[k_itemheld] = 0; + // Copy interp data + mine->old_angle = thismine->old_angle; + mine->old_x = thismine->old_x; + mine->old_y = thismine->old_y; + mine->old_z = thismine->old_z; - if (--thismine->target->player->kartstuff[k_itemamount] <= 0) - thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE; - } + // Since we aren't using P_KillMobj, we need to clean up the hnext reference + P_SetTarget(&thismine->target->hnext, NULL); // target is the player who owns the mine + thismine->target->player->kartstuff[k_bananadrag] = 0; + thismine->target->player->kartstuff[k_itemheld] = 0; + + if (--thismine->target->player->kartstuff[k_itemamount] <= 0) + thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE; P_RemoveMobj(thismine); @@ -4504,6 +4508,12 @@ void K_DropHnextList(player_t *player) dropwork->floorz = work->floorz; dropwork->ceilingz = work->ceilingz; + // Copy interp data + dropwork->old_angle = work->old_angle; + dropwork->old_x = work->old_x; + dropwork->old_y = work->old_y; + dropwork->old_z = work->old_z; + if (ponground) { // floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn diff --git a/src/p_mobj.c b/src/p_mobj.c index 194585bbc..86ca38cc6 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10821,8 +10821,9 @@ void P_SpawnPlayer(INT32 playernum) mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER); I_Assert(mobj != NULL); (mobj->player = p)->mo = mobj; + //P_SetTarget(&p->mo, mobj); - mobj->angle = 0; + mobj->angle = mobj->old_angle = 0; // set color translations for player sprites mobj->color = p->skincolor; @@ -10929,6 +10930,12 @@ void P_AfterPlayerSpawn(INT32 playernum) mobj_t *mobj = p->mo; UINT8 i; + // Update interpolation + mobj->old_x = mobj->x; + mobj->old_y = mobj->y; + mobj->old_z = mobj->z; + mobj->old_angle = mobj->angle; + for (i = 0; i <= splitscreen; i++) { if (playernum == P_GetLocalPlayerNumForNum(i)) diff --git a/src/p_saveg.c b/src/p_saveg.c index 7a2883068..9108e6ab1 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -339,7 +339,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading) for (j = 0; j < NUMKARTSTUFF; j++) player->kartstuff[j] = READINT32(save->p); - player->frameangle = READANGLE(save->p); + player->frameangle = player->old_frameangle = READANGLE(save->p); player->playerstate = READUINT8(save->p); player->pflags = READUINT32(save->p); @@ -2037,15 +2037,15 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker) if (diff & MD_POS) { - mobj->x = READFIXED(save->p); - mobj->y = READFIXED(save->p); - mobj->angle = READANGLE(save->p); + mobj->x = mobj->old_x = READFIXED(save->p); + mobj->y = mobj->old_y = READFIXED(save->p); + mobj->angle = mobj->old_angle = READANGLE(save->p); } else { - mobj->x = mobj->spawnpoint->x << FRACBITS; - mobj->y = mobj->spawnpoint->y << FRACBITS; - mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT); + mobj->x = mobj->old_x = mobj->spawnpoint->x << FRACBITS; + mobj->y = mobj->old_y = mobj->spawnpoint->y << FRACBITS; + mobj->angle = mobj->old_angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT); } if (diff & MD_MOM) diff --git a/src/p_telept.c b/src/p_telept.c index 539e0050b..b7bdb0346 100644 --- a/src/p_telept.c +++ b/src/p_telept.c @@ -106,6 +106,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, P_FlashPal(thing->player, PAL_MIXUP, 10); } + thing->old_angle += (angle-thing->angle); thing->angle = angle; thing->momx = thing->momy = thing->momz = 0; diff --git a/src/p_user.c b/src/p_user.c index 943523244..e42411160 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1162,6 +1162,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST); + // not sure if this is safe to do........... + //P_SetTarget(&ghost->target, mobj); + P_SetScale(ghost, mobj->scale); ghost->scalespeed = mobj->scalespeed; ghost->destscale = mobj->scale; @@ -1175,10 +1178,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->color = mobj->color; ghost->colorized = mobj->colorized; // Kart: they should also be colorized if their origin is - if (mobj->player) - ghost->angle = mobj->player->frameangle; - else - ghost->angle = mobj->angle; + ghost->angle = (mobj->player ? mobj->player->frameangle : mobj->angle); ghost->sprite = mobj->sprite; ghost->frame = mobj->frame; @@ -1191,6 +1191,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->localskin = mobj->localskin; ghost->skinlocal = mobj->skinlocal; + // same deal... + //ghost->standingslope = mobj->standingslope; + ghost->spritexscale = mobj->spritexscale; ghost->spriteyscale = mobj->spriteyscale; ghost->spritexoffset = mobj->spritexoffset;