aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/gui_v2.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-02-15 03:36:30 +0000
committerFlorian Kagerer2009-02-15 03:36:30 +0000
commit16a57f299cdad82a87c1d397b56b663a9426c38e (patch)
tree21fcc6ac31586e322840be55c4dc052654c0b385 /engines/kyra/gui_v2.cpp
parent36767120e1d3553217809af262d844474f926c03 (diff)
downloadscummvm-rg350-16a57f299cdad82a87c1d397b56b663a9426c38e.tar.gz
scummvm-rg350-16a57f299cdad82a87c1d397b56b663a9426c38e.tar.bz2
scummvm-rg350-16a57f299cdad82a87c1d397b56b663a9426c38e.zip
LOL: - implemented proper button processing (works exactly as in Kyra 2 and 3, so we do have some code duplication atm, I just fixed right mouse button support for LOL)
- keyboard control now works svn-id: r38190
Diffstat (limited to 'engines/kyra/gui_v2.cpp')
-rw-r--r--engines/kyra/gui_v2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp
index 20ebf8d9aa..3994d45686 100644
--- a/engines/kyra/gui_v2.cpp
+++ b/engines/kyra/gui_v2.cpp
@@ -218,13 +218,13 @@ int GUI_v2::processButtonList(Button *buttonList, uint16 inputFlag, int8 mouseWh
buttonList->flags2 &= ~0x80;
uint16 inFlags = inputFlag & 0x7FFF;
if (inFlags) {
- if (buttonList->unk6 == inFlags) {
+ if (buttonList->keyCode == inFlags) {
progress = true;
flags = buttonList->flags & 0x0F00;
buttonList->flags2 |= 0x80;
inputFlag = 0;
_unknownButtonList = buttonList;
- } else if (buttonList->unk8 == inFlags) {
+ } else if (buttonList->keyCode2 == inFlags) {
flags = buttonList->flags & 0xF000;
if (!flags)
flags = buttonList->flags & 0x0F00;