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

Merge branch 'charsel-colorfix-2' into 'master'

Browse source 
Tiny charsel colour fix

See merge request KartKrew/Kart!1512
This commit is contained in:
Oni 2023-09-20 06:15:17 +00:00
commit 83cbdb4601
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/menus/play-char-select.c
View file

@ -181,6 +181,10 @@ static void M_SetupProfileGridPos(setup_player_t *p)
p->followercategory = followers[p->followern].category; p->followercategory = followers[p->followern].category;
p->followercolor = pr->followercolor; p->followercolor = pr->followercolor;
if (K_ColorUsable(p->followercolor, true, true) == false)
{
p->followercolor = SKINCOLOR_NONE;
}
if (!R_SkinUsable(g_localplayers[0], i, false)) if (!R_SkinUsable(g_localplayers[0], i, false))
{ {
@ -196,7 +200,13 @@ static void M_SetupProfileGridPos(setup_player_t *p)
alt++; alt++;
p->clonenum = alt; p->clonenum = alt;
p->color = pr->color; p->color = pr->color;
if (K_ColorUsable(p->color, false, true) == false)
{
p->color = SKINCOLOR_NONE;
}
} }
static void M_SetupMidGameGridPos(setup_player_t *p, UINT8 num) static void M_SetupMidGameGridPos(setup_player_t *p, UINT8 num)
@ -1256,13 +1266,6 @@ boolean M_CharacterSelectHandler(INT32 choice)
p->skin = setup_chargrid[p->gridx][p->gridy].skinlist[p->clonenum]; p->skin = setup_chargrid[p->gridx][p->gridy].skinlist[p->clonenum];
} }
// Keep profile colour.
/*if (p->mdepth < CSSTEP_COLORS)
{
p->color = skins[p->skin].prefcolor;
}*/
if (playersChanged == true) if (playersChanged == true)
{ {
setup_page = 0; // reset that. setup_page = 0; // reset that.