incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-teleport-interpolation' into 'fix-reset-interpolation'

Browse source 
412 teleport: correctly update interpolation state

See merge request KartKrew/Kart!1193
This commit is contained in:
Sal 2023-04-23 13:56:52 +00:00 committed by NepDisk
parent d0a8d0bc57
commit 43ecac1e8d
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_spec.c
View file

@ -2703,11 +2703,7 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
y = line->args[3] << FRACBITS;
z = line->args[4] << FRACBITS;
P_UnsetThingPosition(mo);
mo->x += x;
mo->y += y;
mo->z += z;
P_SetThingPosition(mo);
P_SetOrigin(mo, mo->x + x, mo->y + y, mo->z + z);
if (mo->player)
{

2
src/p_telept.c
View file

@ -163,6 +163,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]);
}
R_ResetViewInterpolation(1 + i);
break;
}
}