diff options
| author | Max Horn | 2007-06-22 23:03:12 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-22 23:03:12 +0000 |
| commit | a041ef23174a21eb42285e8c518f38b81468b13d (patch) | |
| tree | 0104912998af89016c5d935fda66898b13d400ef /engines/sword2/controls.cpp | |
| parent | d0ee1b3c8ff521707a6f5064ee54638460aaee21 (diff) | |
| download | scummvm-rg350-a041ef23174a21eb42285e8c518f38b81468b13d.tar.gz scummvm-rg350-a041ef23174a21eb42285e8c518f38b81468b13d.tar.bz2 scummvm-rg350-a041ef23174a21eb42285e8c518f38b81468b13d.zip | |
Slightly updated key handling in BS2, Kyra, and Touche
svn-id: r27637
Diffstat (limited to 'engines/sword2/controls.cpp')
| -rw-r--r-- | engines/sword2/controls.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp index eeb2cda2d9..84580c7520 100644 --- a/engines/sword2/controls.cpp +++ b/engines/sword2/controls.cpp @@ -318,9 +318,9 @@ int Dialog::runModal() { KeyboardEvent *ke = _vm->keyboardEvent(); if (ke) { - if (ke->keycode == Common::KEYCODE_ESCAPE) + if (ke->kbd.keycode == Common::KEYCODE_ESCAPE) setResult(0); - else if (ke->keycode == Common::KEYCODE_RETURN || ke->keycode == Common::KEYCODE_KP_ENTER) + else if (ke->kbd.keycode == Common::KEYCODE_RETURN || ke->kbd.keycode == Common::KEYCODE_KP_ENTER) setResult(1); } @@ -1131,13 +1131,13 @@ public: virtual void onKey(KeyboardEvent *ke) { if (_editable) { - if (ke->keycode == Common::KEYCODE_BACKSPACE) + if (ke->kbd.keycode == Common::KEYCODE_BACKSPACE) _parent->onAction(this, Common::KEYCODE_BACKSPACE); - else if (ke->ascii >= ' ' && ke->ascii <= 255) { + else if (ke->kbd.ascii >= ' ' && ke->kbd.ascii <= 255) { // Accept the character if the font renderer // has what looks like a valid glyph for it. - if (_fr->getCharWidth(ke->ascii)) - _parent->onAction(this, ke->ascii); + if (_fr->getCharWidth(ke->kbd.ascii)) + _parent->onAction(this, ke->kbd.ascii); } } } |