mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Move join spectate below bot set, just in case
This commit is contained in:
parent
dc45f4427b
commit
5a01279c10
1 changed files with 7 additions and 7 deletions
|
|
@ -3753,13 +3753,6 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||||
G_AddPlayer(newplayernum, console);
|
G_AddPlayer(newplayernum, console);
|
||||||
memcpy(players[newplayernum].public_key, public_key, PUBKEYLENGTH);
|
memcpy(players[newplayernum].public_key, public_key, PUBKEYLENGTH);
|
||||||
|
|
||||||
// Previously called at the top of this function, commented as
|
|
||||||
// "caused desyncs in this spot :(". But we can't do this in
|
|
||||||
// G_PlayerReborn, since that only runs for level contexts and
|
|
||||||
// allows people to party-crash the vote screen even when
|
|
||||||
// maxplayers is too low for them. Let's try it here...?
|
|
||||||
G_SpectatePlayerOnJoin(newplayernum);
|
|
||||||
|
|
||||||
for (i = 0; i < MAXAVAILABILITY; i++)
|
for (i = 0; i < MAXAVAILABILITY; i++)
|
||||||
{
|
{
|
||||||
newplayer->availabilities[i] = READUINT8(*p);
|
newplayer->availabilities[i] = READUINT8(*p);
|
||||||
|
|
@ -3798,6 +3791,13 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||||
players[newplayernum].splitscreenindex = splitscreenplayer;
|
players[newplayernum].splitscreenindex = splitscreenplayer;
|
||||||
players[newplayernum].bot = false;
|
players[newplayernum].bot = false;
|
||||||
|
|
||||||
|
// Previously called at the top of this function, commented as
|
||||||
|
// "caused desyncs in this spot :(". But we can't do this in
|
||||||
|
// G_PlayerReborn, since that only runs for level contexts and
|
||||||
|
// allows people to party-crash the vote screen even when
|
||||||
|
// maxplayers is too low for them. Let's try it here...?
|
||||||
|
G_SpectatePlayerOnJoin(newplayernum);
|
||||||
|
|
||||||
if (node == mynode && splitscreenplayer == 0)
|
if (node == mynode && splitscreenplayer == 0)
|
||||||
S_AttemptToRestoreMusic(); // Earliest viable point
|
S_AttemptToRestoreMusic(); // Earliest viable point
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue