From f108a0feb99e3901f3ccdecd0f5195cc65c488c1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 24 Nov 2017 19:31:52 -0500 Subject: [PATCH] XEEN: Toggle UI buttons properly within items dialog --- engines/xeen/dialogs.cpp | 4 ++-- engines/xeen/dialogs_items.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engines/xeen/dialogs.cpp b/engines/xeen/dialogs.cpp index f1c1032d237..2f07b812f86 100644 --- a/engines/xeen/dialogs.cpp +++ b/engines/xeen/dialogs.cpp @@ -112,8 +112,8 @@ bool ButtonContainer::checkEvents(XeenEngine *vm) { win.update(); // Slight delay - screen.update(); - events.wait(4); + events.updateGameCounter(); + events.wait(2); // Redraw button in it's original non-depressed form btn._sprites->draw(screen, btnIndex * 2, diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index 5f0a2feb312..78a63c10014 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -526,7 +526,7 @@ void ItemsDialog::loadButtons(ItemsMode mode, Character *&c) { addButton(Common::Rect(12, 109, 36, 129), Common::KEYCODE_w, &_iconSprites); addButton(Common::Rect(46, 109, 70, 129), Common::KEYCODE_a, &_iconSprites); addButton(Common::Rect(80, 109, 104, 129), Common::KEYCODE_c, &_iconSprites); - addButton(Common::Rect(114, 109, 138, 129), Common::KEYCODE_n, &_iconSprites); + addButton(Common::Rect(114, 109, 138, 129), Common::KEYCODE_m, &_iconSprites); addButton(Common::Rect(148, 109, 172, 129), Common::KEYCODE_e, &_iconSprites); addButton(Common::Rect(284, 109, 308, 129), Common::KEYCODE_ESCAPE, &_iconSprites); addButton(Common::Rect(148, 109, 172, 129), Common::KEYCODE_u, &_iconSprites); @@ -543,7 +543,7 @@ void ItemsDialog::loadButtons(ItemsMode mode, Character *&c) { addButton(Common::Rect(12, 109, 36, 129), Common::KEYCODE_w, &_iconSprites); addButton(Common::Rect(46, 109, 70, 129), Common::KEYCODE_a, &_iconSprites); addButton(Common::Rect(80, 109, 104, 129), Common::KEYCODE_c, &_iconSprites); - addButton(Common::Rect(114, 109, 138, 129), Common::KEYCODE_n, &_iconSprites); + addButton(Common::Rect(114, 109, 138, 129), Common::KEYCODE_m, &_iconSprites); addButton(Common::Rect(148, 109, 172, 129), Common::KEYCODE_e, &_iconSprites); addButton(Common::Rect(182, 109, 206, 129), Common::KEYCODE_r, &_iconSprites); addButton(Common::Rect(216, 109, 240, 129), Common::KEYCODE_d, &_iconSprites);