mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'fix-mindelay-send' into 'master'
Fix mindelay wpnpref not being applied on join Closes ring-racers#149 See merge request kart-krew-dev/ring-racers-internal!2890
This commit is contained in:
commit
997f995ce9
1 changed files with 6 additions and 6 deletions
|
|
@ -3812,6 +3812,12 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||||
newplayer->availabilities[i] = READUINT8(*p);
|
newplayer->availabilities[i] = READUINT8(*p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (server)
|
||||||
|
{
|
||||||
|
for (i = 0; i < G_LocalSplitscreenPartySize(newplayernum); ++i)
|
||||||
|
playerdelaytable[G_LocalSplitscreenPartyMember(newplayernum, i)] = mindelay;
|
||||||
|
}
|
||||||
|
|
||||||
// the server is creating my player
|
// the server is creating my player
|
||||||
if (node == mynode)
|
if (node == mynode)
|
||||||
{
|
{
|
||||||
|
|
@ -3839,12 +3845,6 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||||
|
|
||||||
P_ForceLocalAngle(newplayer, newplayer->angleturn);
|
P_ForceLocalAngle(newplayer, newplayer->angleturn);
|
||||||
addedtogame = true;
|
addedtogame = true;
|
||||||
|
|
||||||
if (server)
|
|
||||||
{
|
|
||||||
for (i = 0; i < G_LocalSplitscreenPartySize(newplayernum); ++i)
|
|
||||||
playerdelaytable[G_LocalSplitscreenPartyMember(newplayernum, i)] = mindelay;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
newplayer->splitscreenindex = splitscreenplayer;
|
newplayer->splitscreenindex = splitscreenplayer;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue