From 9eaf53b11fdec64874d708dee35508847d758f39 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 21 Sep 2024 22:59:36 -0700 Subject: [PATCH] Misc menu fixups --- src/k_zvote.c | 2 +- src/menus/transient/pause-addonoptions.cpp | 2 +- src/menus/transient/pause-cheats.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_zvote.c b/src/k_zvote.c index 68ede592c..cc3462b71 100644 --- a/src/k_zvote.c +++ b/src/k_zvote.c @@ -1227,7 +1227,7 @@ void K_DrawMidVote(void) if (drawButton == true) { K_DrawGameControl( - x-20, y-2, id, + x/FRACUNIT-20, y/FRACUNIT-2, id, pressed ? "" : "", 0, 8, V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN ); diff --git a/src/menus/transient/pause-addonoptions.cpp b/src/menus/transient/pause-addonoptions.cpp index 0a0a0c207..9d733cc4f 100644 --- a/src/menus/transient/pause-addonoptions.cpp +++ b/src/menus/transient/pause-addonoptions.cpp @@ -264,7 +264,7 @@ void draw_menu() draw.x(BASEVIDWIDTH/2).font(Draw::Font::kGamemode).text(mode_strings[menu_mode()]); if (server || IsPlayerAdmin(consoleplayer)) - K_DrawGameControl(draw.x(), draw.y(), 0, M_MenuButtonHeld(0, MBT_Y) ? "" : "", 0, 8, 0); + K_DrawGameControl(draw.x() + 8, draw.y()-6, 0, M_MenuButtonHeld(0, MBT_Y) ? " Switch Page" : " Switch Page", 0, 8, 0); // K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y)); draw = draw.y(32 + kMargin); diff --git a/src/menus/transient/pause-cheats.cpp b/src/menus/transient/pause-cheats.cpp index d00bc1ed9..b6e5160e1 100644 --- a/src/menus/transient/pause-cheats.cpp +++ b/src/menus/transient/pause-cheats.cpp @@ -208,7 +208,7 @@ void draw_menu() draw = draw.y(27 + kMargin); draw.x(BASEVIDWIDTH/2).font(Draw::Font::kGamemode).text(mode_strings[menu_mode()]); - K_DrawGameControl(draw.x(), draw.y(), 0, M_MenuButtonHeld(0, MBT_Y) ? "" : "", 0, 8, 0); + K_DrawGameControl(draw.x() + 8, draw.y()-6, 0, M_MenuButtonHeld(0, MBT_Y) ? " Switch Page" : " Switch Page", 0, 8, 0); // K_drawButton((draw.x() + 8) * FRACUNIT, (draw.y() + 8) * FRACUNIT, 0, kp_button_y[0], M_MenuButtonHeld(0, MBT_Y)); draw = draw.y(32 + kMargin);