From 555e4eaa4c3a877b46611562a7ff4bd27b4f0fe5 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 27 Sep 2024 04:44:59 -0700 Subject: [PATCH] Final raw button literal fixups?! --- src/d_clisrv.c | 11 ++++++----- src/k_kart.c | 2 +- src/k_menudraw.c | 2 +- src/menus/transient/pause-addonoptions.cpp | 2 +- src/st_stuff.c | 8 ++++---- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index b03224472..870b2cc1a 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -75,6 +75,7 @@ // cl loading screen #include "v_video.h" #include "f_finale.h" +#include "k_hud.h" #ifdef HAVE_DISCORDRPC #include "discord.h" @@ -685,7 +686,7 @@ static inline void CL_DrawConnectionStatus(void) // Draw bottom box M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press \xAB or \xAD to abort"); + K_DrawGameControl(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, 0, "Press or to abort", 1, 2, V_YELLOWMAP); for (i = 0; i < 16; ++i) V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-24, 16, 8, palstart + ((animtime - i) & 15)); @@ -758,7 +759,7 @@ static inline void CL_DrawConnectionStatus(void) INT32 checkednum = 0; INT32 i; - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press \xAB or \xAD to abort"); + K_DrawGameControl(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, 0, "Press or to abort", 1, 2, V_YELLOWMAP); //ima just count files here for (i = 0; i < fileneedednum; i++) @@ -780,7 +781,7 @@ static inline void CL_DrawConnectionStatus(void) INT32 loadcompletednum = 0; INT32 i; - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press \xAB or \xAD to abort"); + K_DrawGameControl(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, 0, "Press or to abort", 1, 2, V_YELLOWMAP); //ima just count files here for (i = 0; i < fileneedednum; i++) @@ -807,7 +808,7 @@ static inline void CL_DrawConnectionStatus(void) // Draw the bottom box. M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1); - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, V_YELLOWMAP, "Press \xAB or \xAD to abort"); + K_DrawGameControl(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, 0, "Press or to abort", 1, 2, V_YELLOWMAP); Net_GetNetStat(); dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256); @@ -873,7 +874,7 @@ static inline void CL_DrawConnectionStatus(void) //Draw bottom box M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); - V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press \xAB or \xAD to abort"); + K_DrawGameControl(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, 0, "Press or to abort", 1, 2, V_YELLOWMAP); for (i = 0; i < 16; ++i) V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-24, 16, 8, palstart + ((animtime - i) & 15)); diff --git a/src/k_kart.c b/src/k_kart.c index f0dc9d530..8de6f538e 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9502,7 +9502,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (!player->bigwaypointgap) K_DoIngameRespawn(player); else if (player->bigwaypointgap == AUTORESPAWN_THRESHOLD) - K_AddMessageForPlayer(player, "Press \xAE to respawn", true, false); + K_AddMessageForPlayer(player, "Press to respawn", true, false); } if (player->tripwireUnstuck && !player->mo->hitlag) diff --git a/src/k_menudraw.c b/src/k_menudraw.c index acfc86168..82710d282 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -1240,7 +1240,7 @@ static INT32 M_DrawRejoinIP(INT32 x, INT32 y, INT32 tx) V_DrawMenuString(x - 10 - (skullAnimCounter/5), y, f, "\x1C"); // left arrow V_DrawMenuString(x + w + 2+ (skullAnimCounter/5), y, f, "\x1D"); // right arrow V_DrawThinString(x, y, f, text); - V_DrawRightAlignedThinString(BASEVIDWIDTH + 4 + tx, y, V_ORANGEMAP, "\xAC Rejoin"); + K_DrawGameControl(BASEVIDWIDTH + 4 + tx, y, 0, " Rejoin", 2, 0, V_ORANGEMAP); return shift; } diff --git a/src/menus/transient/pause-addonoptions.cpp b/src/menus/transient/pause-addonoptions.cpp index 9d733cc4f..a7db2ccfe 100644 --- a/src/menus/transient/pause-addonoptions.cpp +++ b/src/menus/transient/pause-addonoptions.cpp @@ -146,7 +146,7 @@ void list_commands() if (flags & COM_NOSHOWHELP) continue; - g_menu.push_back(menuitem_t {IT_STRING | IT_CALL, cmd->name, "Press \xAA to execute this command", nullptr, {.routine = call}, 0, 8}); + g_menu.push_back(menuitem_t {IT_STRING | IT_CALL, cmd->name, "No information available for commands. Press to execute.", nullptr, {.routine = call}, 0, 8}); } } diff --git a/src/st_stuff.c b/src/st_stuff.c index aac564183..5531316cd 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1498,10 +1498,10 @@ void ST_DrawServerSplash(boolean timelimited) void ST_DrawSaveReplayHint(INT32 flags) { - V_DrawRightAlignedThinString( - BASEVIDWIDTH - 2, 2, - flags|V_YELLOWMAP, - (demo.willsave && demo.titlename[0]) ? "Replay will be saved. \xAB Change title" : "\xAB or \xAD Save replay" + K_DrawGameControl( + BASEVIDWIDTH - 2, 2, 0, + (demo.willsave && demo.titlename[0]) ? "Replay will be saved. Change title" : " or Save replay", + 2, 0, flags|V_YELLOWMAP ); }