From 88bd460cde859b60c198e967cf946d552840f490 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sun, 22 Sep 2024 00:02:48 -0700 Subject: [PATCH] Fix midvote wrong coords (resolves mystery keyboard patch in tutorial) --- src/k_dialogue.cpp | 28 ---------------------------- src/k_zvote.c | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/k_dialogue.cpp b/src/k_dialogue.cpp index 4f965c25a..36c90a079 100644 --- a/src/k_dialogue.cpp +++ b/src/k_dialogue.cpp @@ -492,34 +492,6 @@ void Dialogue::Draw(void) drawer.xy(-18 + 4 - 5, -7-8 - 14).align(Draw::Align::kCenter).font(Draw::Font::kMenu).text(srb2::Draw::TextElement().parse(intertext).string()); } - - /* - if (Dismissable()) - { - if (TextDone()) - { - drawer - .xy(-14, -7-5) - .patch(patchCache["TUTDIAG2"]); - } - - std::string ctrl = ""; - - if (Held()) - ctrl += ""; - else if (TextDone()) - ctrl += ""; - else - ctrl += ""; - - std::string parsedctrl = srb2::Draw::TextElement().parse(ctrl).string(); - - drawer - .xy(17-14 - BASEVIDWIDTH, -39-16) - .font(Draw::Font::kMenu) - .text(parsedctrl); - } - */ } void Dialogue::Dismiss(void) diff --git a/src/k_zvote.c b/src/k_zvote.c index cc3462b71..0a5ea2421 100644 --- a/src/k_zvote.c +++ b/src/k_zvote.c @@ -1104,7 +1104,7 @@ void K_DrawMidVote(void) exc, NULL ); K_DrawGameControl( - x - 4, y + exc->height - 12, + x/FRACUNIT - 4, y/FRACUNIT + exc->height/FRACUNIT - 12, id, pressed ? "" : "", 0, 8, V_SNAPTOBOTTOM|V_SNAPTORIGHT );