thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix spectators spawning at 0, 0 when joining mid game

Browse source
This commit is contained in:
James R 2022-10-23 15:31:31 -07:00
parent 88bbe8875d
commit 20bfbca029
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_game.c
View file

@ -2562,7 +2562,9 @@ void G_MovePlayerToSpawnOrStarpost(INT32 playernum)
else
P_MovePlayerToStarpost(playernum);
#else
if (leveltime > starttime)
// Player's first spawn should be at the "map start".
// I.e. level load or join mid game.
if (leveltime > starttime && players[playernum].jointime > 0)
P_MovePlayerToStarpost(playernum);
else
P_MovePlayerToSpawn(playernum, G_FindMapStart(playernum));

9
src/p_mobj.c
View file

@ -11556,6 +11556,15 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
{
K_DoIngameRespawn(p);
}
else
{
// This is important for spectators. If you are
// a spectator now, then when you enter the game,
// respawn back at this point.
p->respawn.pointx = x;
p->respawn.pointy = y;
p->respawn.pointz = z;
}
P_AfterPlayerSpawn(playernum);
}