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 Got_NameAndColor

Browse source
This commit is contained in:
Sally Coolatta 2020-08-18 04:23:08 -04:00
parent 75d05702fb
commit 7419cbde03
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_netcmd.c
View file

@ -1487,8 +1487,9 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
{ {
player_t *p = &players[playernum]; player_t *p = &players[playernum];
char name[MAXPLAYERNAME+1]; char name[MAXPLAYERNAME+1];
UINT16 color; UINT16 color, followercolor;
UINT8 skin; UINT8 skin;
SINT8 follower;
UINT8 i; UINT8 i;
#ifdef PARANOIA #ifdef PARANOIA
@ -1516,6 +1517,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
p->availabilities = READUINT32(*cp); p->availabilities = READUINT32(*cp);
color = READUINT16(*cp); color = READUINT16(*cp);
skin = READUINT8(*cp); skin = READUINT8(*cp);
follower = READSINT8(*cp);
followercolor = READUINT16(*cp);
// set name // set name
if (strcasecmp(player_names[playernum], name) != 0) if (strcasecmp(player_names[playernum], name) != 0)
@ -1591,6 +1594,13 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
} }
else else
SetPlayerSkinByNum(playernum, skin); SetPlayerSkinByNum(playernum, skin);
// set follower colour:
// Don't bother doing garbage and kicking if we receive None, this is both silly and a waste of time, this will be handled properly in P_HandleFollower.
p->followercolor = followercolor;
// set follower
SetFollower(playernum, follower);
} }
void SendWeaponPref(UINT8 n) void SendWeaponPref(UINT8 n)