thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-25 23:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

K_GetEffectiveFollowerColor: Handle playercolor being default/NONE in a cleaner, more direct fashion

Browse source 
Fixes the FOLLOWERCOLOR_OPPOSITE handling being wrong in this circumstance
This commit is contained in:
toaster 2023-04-23 21:31:51 +01:00
parent 0fe6fb2fa5
commit 0d203f5dbb
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/k_follower.c
View file

@ -250,17 +250,23 @@ UINT16 K_GetEffectiveFollowerColor(UINT16 followercolor, follower_t *follower, U
return followercolor;
}
if (playercolor == SKINCOLOR_NONE) // get default color
{
if (playerskin == NULL)
{
// Nothing from this line down is valid if playerskin is invalid, just guess Eggman?
playerskin = &skins[0];
}
playercolor = playerskin->prefcolor;
}
if (followercolor == FOLLOWERCOLOR_OPPOSITE) // "Opposite"
{
return skincolors[playercolor].invcolor;
}
// "Match"
if (playercolor == SKINCOLOR_NONE && playerskin != NULL)
{
return playerskin->prefcolor;
}
return playercolor;
}