mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Merge branch 'fix-teleport-interpolation' into 'fix-reset-interpolation'
412 teleport: correctly update interpolation state See merge request KartKrew/Kart!1193
This commit is contained in:
commit
1e22a8f4c0
2 changed files with 3 additions and 5 deletions
|
|
@ -2853,11 +2853,7 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
|
||||||
y = args[3] << FRACBITS;
|
y = args[3] << FRACBITS;
|
||||||
z = args[4] << FRACBITS;
|
z = args[4] << FRACBITS;
|
||||||
|
|
||||||
P_UnsetThingPosition(mo);
|
P_SetOrigin(mo, mo->x + x, mo->y + y, mo->z + z);
|
||||||
mo->x += x;
|
|
||||||
mo->y += y;
|
|
||||||
mo->z += z;
|
|
||||||
P_SetThingPosition(mo);
|
|
||||||
|
|
||||||
if (mo->player)
|
if (mo->player)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -169,6 +169,8 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
|
||||||
P_ResetCamera(thing->player, &camera[i]);
|
P_ResetCamera(thing->player, &camera[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
R_ResetViewInterpolation(1 + i);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue