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

P_InitPlayers: In GT_TUTORIAL, force the presence of Mystic Melody if it's unlocked

Browse source
This commit is contained in:
toaster 2023-12-18 20:35:46 +00:00
parent c93e02af4a
commit 2c815258c0
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/p_setup.c
View file

@ -7847,8 +7847,7 @@ static void P_InitCamera(void)
static void P_InitPlayers(void) static void P_InitPlayers(void)
{ {
UINT8 i; INT32 i, skin = -1, follower = -1;
INT32 skin = -1;
// Make sure objectplace is OFF when you first start the level! // Make sure objectplace is OFF when you first start the level!
OP_ResetObjectplace(); OP_ResetObjectplace();
@ -7871,6 +7870,18 @@ static void P_InitPlayers(void)
{ {
skin = 0; skin = 0;
} }
if (netgame)
; // shouldn't happen but at least attempt to sync if it does
else for (i = 0; i < numfollowers; i++)
{
if (followers[i].hornsound != sfx_melody)
continue;
if (K_FollowerUsable(i))
follower = i;
break;
}
} }
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
@ -7885,8 +7896,10 @@ static void P_InitPlayers(void)
{ {
players[i].skin = skin; players[i].skin = skin;
players[i].skincolor = skins[skin].prefcolor; players[i].skincolor = skins[skin].prefcolor;
players[i].followerskin = -1;
// followercolor can be left alone for hopefully obvious reasons players[i].followerskin = follower;
if (follower != -1)
players[i].followercolor = followers[follower].defaultcolor;
} }
G_SpawnPlayer(i); G_SpawnPlayer(i);