diff options
| author | Max Horn | 2007-06-22 21:10:57 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-22 21:10:57 +0000 |
| commit | 54d668ac13f57d8acf5d8e627a5daeaa8166ecb3 (patch) | |
| tree | ff16ba9d667c29b9f24286a7f27d2beab845936b /engines/lure | |
| parent | e8a4d396fe08cde375c9193a4dbb8847f663e774 (diff) | |
| download | scummvm-rg350-54d668ac13f57d8acf5d8e627a5daeaa8166ecb3.tar.gz scummvm-rg350-54d668ac13f57d8acf5d8e627a5daeaa8166ecb3.tar.bz2 scummvm-rg350-54d668ac13f57d8acf5d8e627a5daeaa8166ecb3.zip | |
Changed more code to use Common::KEYCODE_ enum
svn-id: r27624
Diffstat (limited to 'engines/lure')
| -rw-r--r-- | engines/lure/menu.cpp | 6 | ||||
| -rw-r--r-- | engines/lure/surface.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index 8b3003c808..95b27470cd 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -478,14 +478,14 @@ uint16 PopupMenu::Show(int numEntries, const char *actions[]) { byte ch = e.event().kbd.ascii; uint16 keycode = e.event().kbd.keycode; - if (((keycode == 0x108) || (keycode == 0x111)) && (selectedIndex > 0)) { + if (((keycode == Common::KEYCODE_KP8) || (keycode == Common::KEYCODE_UP)) && (selectedIndex > 0)) { --selectedIndex; refreshFlag = true; - } else if (((keycode == 0x102) || (keycode == 0x112)) && + } else if (((keycode == Common::KEYCODE_KP2) || (keycode == Common::KEYCODE_DOWN)) && (selectedIndex < numEntries-1)) { ++selectedIndex; refreshFlag = true; - } else if ((ch == '\xd') || (keycode == 0x10f)) { + } else if ((ch == '\xd') || (keycode == Common::KEYCODE_KP_ENTER)) { goto bail_out; } else if (ch == '\x1b') { selectedIndex = 0xffff; diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp index b7baf53a76..0775d4261b 100644 --- a/engines/lure/surface.cpp +++ b/engines/lure/surface.cpp @@ -420,7 +420,7 @@ bool Surface::getString(Common::String &line, int maxSize, bool isNumeric, bool char ch = events.event().kbd.ascii; uint16 keycode = events.event().kbd.keycode; - if ((ch == 13) || (keycode == 0x10f)) { + if ((keycode == Common::KEYCODE_RETURN) || (keycode == Common::KEYCODE_KP_ENTER)) { // Return character screen.screen().fillRect( Rect(x, y, x + maxSize - 1, y + FONT_HEIGHT), bgColour); @@ -430,13 +430,13 @@ bool Surface::getString(Common::String &line, int maxSize, bool isNumeric, bool mouse.cursorOn(); return true; } - else if (ch == 27) { + else if (keycode == Common::KEYCODE_ESC) { // Escape character screen.screen().fillRect( Rect(x, y, x + maxSize - 1, y + FONT_HEIGHT), bgColour); screen.update(); abortFlag = true; - } else if (ch == 8) { + } else if (keycode == Common::KEYCODE_BACKSPACE) { // Delete the last character if (newLine.size() == 1) continue; |