mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-27 04:41:23 +00:00
Fix undesired interpolation for regular teleport
This commit is contained in:
parent
b6eb21c5e2
commit
054bbd7745
1 changed files with 9 additions and 16 deletions
|
@ -17,6 +17,7 @@
|
||||||
#include "r_state.h"
|
#include "r_state.h"
|
||||||
#include "s_sound.h"
|
#include "s_sound.h"
|
||||||
#include "r_main.h"
|
#include "r_main.h"
|
||||||
|
#include "r_fps.h"
|
||||||
|
|
||||||
/** \brief The P_MixUp function
|
/** \brief The P_MixUp function
|
||||||
|
|
||||||
|
@ -149,25 +150,17 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
|
||||||
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
||||||
|
|
||||||
// absolute angle position
|
// absolute angle position
|
||||||
if (thing == players[consoleplayer].mo)
|
|
||||||
localangle[0] = angle;
|
|
||||||
else if (splitscreen)
|
|
||||||
{
|
|
||||||
for (i = 1; i <= splitscreen; i++)
|
|
||||||
{
|
|
||||||
if (thing == players[displayplayers[i]].mo)
|
|
||||||
{
|
|
||||||
localangle[i] = angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// move chasecam at new player location
|
// move chasecam at new player location
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (thing->player == &players[displayplayers[i]] && camera[i].chase)
|
if (thing->player == &players[displayplayers[i]])
|
||||||
|
{
|
||||||
|
localangle[i] = angle;
|
||||||
|
if (camera[i].chase)
|
||||||
P_ResetCamera(thing->player, &camera[i]);
|
P_ResetCamera(thing->player, &camera[i]);
|
||||||
|
R_ResetViewInterpolation(i + 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't run in place after a teleport
|
// don't run in place after a teleport
|
||||||
|
|
Loading…
Reference in a new issue