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

P_InitPlayers: Tidy up the barely-significant difference between G_DoReborn and G_SpawnPlayer

Browse source 
Only kills objectplace at map start, not general respawn
This commit is contained in:
toaster 2023-08-31 17:30:05 +01:00
parent 1dd2e7031a
commit a7b065c4d8
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/g_game.c
View file

@ -2831,9 +2831,6 @@ void G_DoReborn(INT32 playernum)
{ {
player_t *player = &players[playernum]; player_t *player = &players[playernum];
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
{ {
// respawn at the start // respawn at the start
mobj_t *oldmo = NULL; mobj_t *oldmo = NULL;

12
src/p_setup.c
View file

@ -7835,6 +7835,9 @@ static void P_InitPlayers(void)
UINT8 i; UINT8 i;
INT32 skin = -1; INT32 skin = -1;
// Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace();
// Are we forcing a character? // Are we forcing a character?
if (gametype == GT_TUTORIAL) if (gametype == GT_TUTORIAL)
{ {
@ -7871,14 +7874,7 @@ static void P_InitPlayers(void)
// followercolor can be left alone for hopefully obvious reasons // followercolor can be left alone for hopefully obvious reasons
} }
if (!(gametyperules & GTR_CIRCUIT) && K_PodiumSequence() == false) G_SpawnPlayer(i);
{
G_DoReborn(i);
}
else // gametype is race
{
G_SpawnPlayer(i);
}
players[i].xtralife = 0; // extra lives do not ever carry over from the previous round players[i].xtralife = 0; // extra lives do not ever carry over from the previous round
} }