From 1c87d358fb7725ad24dca157a5ccc7d1eb4b97ae Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Mon, 16 Sep 2024 04:30:15 -0700 Subject: [PATCH] Early review fixes --- src/g_input.c | 4 ++-- src/k_hud.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/g_input.c b/src/g_input.c index 09a6204d2..2eed40c88 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -1002,7 +1002,7 @@ const char *G_KeynumToString(INT32 keynum) // return a string with the ascii char if displayable if (keynum > ' ' && keynum <= 'z' && keynum != KEY_CONSOLE) { - keynamestr[0] = (char)(keynum - 32); // Uppercase looks better! + keynamestr[0] = toupper(keynum); // Uppercase looks better! keynamestr[1] = '\0'; return keynamestr; } @@ -1026,7 +1026,7 @@ const char *G_KeynumToShortString(INT32 keynum) // return a string with the ascii char if displayable if (keynum > ' ' && keynum <= 'z' && keynum != KEY_CONSOLE) { - keynamestr[0] = (char)(keynum - 32); // Uppercase looks better! + keynamestr[0] = toupper(keynum); // Uppercase looks better! keynamestr[1] = '\0'; return keynamestr; } diff --git a/src/k_hud.cpp b/src/k_hud.cpp index fd6ea180a..7fab59bdb 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -6425,7 +6425,7 @@ static void K_DrawMessageFeed(void) text.font(Draw::Font::kMenu); - UINT8 x = 160; + UINT8 x = BASEVIDWIDTH/2; UINT8 y = 10; SINT8 shift = 0; if (r_splitscreen >= 2) @@ -6449,6 +6449,7 @@ static void K_DrawMessageFeed(void) if (i >= 1) y += BASEVIDHEIGHT / 2; } + UINT16 sw = text.width(); K_DrawSticker(x - sw/2, y, sw, 0, true); @@ -6502,7 +6503,7 @@ void K_drawKartHUD(void) } - if (1) + if (0) { Draw::TextElement text = Draw::TextElement().parse("\xEELEFTSPACE\xEE\n\xEESPC\xEE \xEETAB\xEE\nA \xEF\xA0 A\nB \xEF\xA1 B\nX \xEF\xA2 X\nY \xEF\xA3 Y\nLB \xEF\xA4 LB\nRB \xEF\xA5 RB\nLT \xEF\xA6 LT\nRT \xEF\xA7 RT\nST \xEF\xA8 ST\nBK \xEF\xA9 BK\nLS \xEF\xAA LS\nRS \xEF\xAB RS\n"); @@ -6957,4 +6958,4 @@ INT32 K_DrawGameControl(UINT16 x, UINT16 y, UINT8 player, const char *str, UINT8 Draw(x, y).align((srb2::Draw::Align)alignment).text(text); return width; -} \ No newline at end of file +}