Merge branch 'char-sel-tooltips' into 'master'

Character Select: add button prompts for R and C buttons

See merge request KartKrew/Kart!1640
This commit is contained in:
Oni 2023-11-17 09:01:54 +00:00
commit 162aba5a95

View file

@ -2090,6 +2090,8 @@ static void M_DrawProfileCard(INT32 x, INT32 y, boolean greyedout, profile_t *p)
void M_DrawCharacterSelect(void)
{
const UINT8 pid = 0;
UINT8 i, j, k;
UINT8 priority = 0;
INT16 quadx, quady;
@ -2102,6 +2104,19 @@ void M_DrawCharacterSelect(void)
priority = setup_animcounter % setup_numplayers;
}
{
const int kLeft = 80;
const int kTop = 6;
const int kButtonWidth = 16;
INT32 x = basex + kLeft;
K_drawButton((x += 18) * FRACUNIT, (kTop - 3) * FRACUNIT, 0, kp_button_r, M_MenuButtonPressed(pid, MBT_R));
V_DrawThinString((x += kButtonWidth), kTop, 0, "Info");
K_drawButton((x += 58) * FRACUNIT, (kTop - 1) * FRACUNIT, 0, kp_button_c[1], M_MenuButtonPressed(pid, MBT_C));
V_DrawThinString((x += kButtonWidth), kTop, 0, "Default");
}
// We have to loop twice -- first time to draw the drop shadows, a second time to draw the icons.
if (forceskin == false)
{