thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge p_telept.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 14:50:35 -04:00
parent 72af9d83ae
commit 3ca9d2a72f
1 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/p_telept.c
View file

@ -64,23 +64,7 @@ void P_MixUp(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
<<<<<<< HEAD
if (thing == players[consoleplayer].mo)
localangle[0] = angle;
else if (r_splitscreen)
{
for (i = 1; i <= r_splitscreen; i++)
{
if (thing == players[displayplayers[i]].mo)
{
localangle[i] = angle;
break;
}
}
}
=======
P_SetPlayerAngle(thing->player, angle); P_SetPlayerAngle(thing->player, angle);
>>>>>>> srb2/next
// move chasecam at new player location // move chasecam at new player location
for (i = 0; i <= r_splitscreen; i++) for (i = 0; i <= r_splitscreen; i++)
@ -178,18 +162,13 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
else else
thing->player->drawangle += (angle - thing->angle); thing->player->drawangle += (angle - thing->angle);
<<<<<<< HEAD // absolute angle position
P_SetPlayerAngle(thing->player, angle);
for (i = 0; i <= r_splitscreen; i++) for (i = 0; i <= r_splitscreen; i++)
{ {
if (thing == players[displayplayers[i]].mo) if (thing == players[displayplayers[i]].mo)
{ {
// absolute angle position
localangle[i] = angle;
=======
// absolute angle position
P_SetPlayerAngle(thing->player, angle);
>>>>>>> srb2/next
if (camera[i].chase) if (camera[i].chase)
{ {
// move chasecam at new player location // move chasecam at new player location