thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'improved-skincolor-info' into 'master'

Browse source 
Racer Setup - Improved 'skincolor' Selection Information

See merge request KartKrew/RingRacers!106
This commit is contained in:
Eidolon 2025-08-23 11:00:55 -05:00
commit c2eea867e9
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/k_menudraw.c
View file

@ -2122,6 +2122,9 @@ static void M_DrawCharSelectPreview(UINT8 num)
if (p->showextra == true) if (p->showextra == true)
{ {
INT32 randomskin = 0; INT32 randomskin = 0;
char variadicInfoBuffer[(MAXCOLORNAME*2) + 1 + 2 + 1];//+1 for spacing, +2 for brackets, +1 for null terminator
UINT16 folcol;
switch (p->mdepth) switch (p->mdepth)
{ {
case CSSTEP_ALTS: // Select clone case CSSTEP_ALTS: // Select clone
@ -2150,7 +2153,12 @@ static void M_DrawCharSelectPreview(UINT8 num)
case CSSTEP_COLORS: // Select color case CSSTEP_COLORS: // Select color
if (p->color < numskincolors) if (p->color < numskincolors)
{ {
V_DrawThinString(x-3, y+2, 0, skincolors[p->color].name); if(p->color == SKINCOLOR_NONE) //'default' handling
sprintf(variadicInfoBuffer, "%s (%s)", skincolors[p->color].name, skincolors[skins[p->skin]->prefcolor].name);
else
sprintf(variadicInfoBuffer, "%s", skincolors[p->color].name);
V_DrawThinString(x-3, y+2, 0, variadicInfoBuffer);
} }
else else
{ {
@ -2180,17 +2188,26 @@ static void M_DrawCharSelectPreview(UINT8 num)
} }
break; break;
case CSSTEP_FOLLOWERCOLORS: case CSSTEP_FOLLOWERCOLORS:
folcol = K_GetEffectiveFollowerColor(p->followercolor, &followers[p->followern], p->color, skins[p->skin]);
if (p->followercolor == FOLLOWERCOLOR_MATCH) if (p->followercolor == FOLLOWERCOLOR_MATCH)
{ {
V_DrawThinString(x-3, y+2, 0, "Match"); sprintf(variadicInfoBuffer, "Match (%s)", skincolors[folcol].name);
V_DrawThinString(x-3, y+2, 0, variadicInfoBuffer);
} }
else if (p->followercolor == FOLLOWERCOLOR_OPPOSITE) else if (p->followercolor == FOLLOWERCOLOR_OPPOSITE)
{ {
V_DrawThinString(x-3, y+2, 0, "Opposite"); sprintf(variadicInfoBuffer, "Opposite (%s)", skincolors[folcol].name);
V_DrawThinString(x-3, y+2, 0, variadicInfoBuffer);
} }
else if (p->followercolor < numskincolors) else if (p->followercolor < numskincolors)
{ {
V_DrawThinString(x-3, y+2, 0, skincolors[p->followercolor].name); if(p->followercolor == SKINCOLOR_NONE) //'default' handling
sprintf(variadicInfoBuffer, "%s (%s)", skincolors[p->followercolor].name, skincolors[folcol].name);
else
sprintf(variadicInfoBuffer, "%s", skincolors[p->followercolor].name);
V_DrawThinString(x-3, y+2, 0, variadicInfoBuffer);
} }
else else
{ {