diff options
| author | Filippos Karapetis | 2015-12-17 00:36:02 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:07 +0100 |
| commit | 605c2e553bd9b8421af643491a7855d8c2cd4710 (patch) | |
| tree | 41239c91478efec4d2ed122a5888555958c623eb /engines/lab | |
| parent | 8b16ccbea1b686f49d78e3337683ad45789b22e9 (diff) | |
| download | scummvm-rg350-605c2e553bd9b8421af643491a7855d8c2cd4710.tar.gz scummvm-rg350-605c2e553bd9b8421af643491a7855d8c2cd4710.tar.bz2 scummvm-rg350-605c2e553bd9b8421af643491a7855d8c2cd4710.zip | |
LAB: Use common keycodes instead of direct keycode values
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/intro.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/map.cpp | 2 | ||||
| -rw-r--r-- | engines/lab/special.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp index 992d2370e7..e26f1821da 100644 --- a/engines/lab/intro.cpp +++ b/engines/lab/intro.cpp @@ -155,7 +155,7 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) { uint16 code = msg->_code; if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) || - ((msgClass == RAWKEY) && (code == 27))) { + ((msgClass == RAWKEY) && (code == Common::KEYCODE_ESCAPE))) { _quitIntro = true; if (isScreen) diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp index 09d89883e1..63ea35398d 100644 --- a/engines/lab/map.cpp +++ b/engines/lab/map.cpp @@ -477,7 +477,7 @@ void LabEngine::processMap(uint16 curRoom) { uint16 mouseX = msg->_mouseX; uint16 mouseY = msg->_mouseY; - if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) || ((msgClass == RAWKEY) && (msgCode == 27))) + if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) || ((msgClass == RAWKEY) && (msgCode == Common::KEYCODE_ESCAPE))) return; if (msgClass == BUTTONUP) { diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index d61ddcb26e..2f071dab35 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -273,7 +273,7 @@ void LabEngine::processJournal() { uint16 buttonId = msg->_code; if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) || - ((msgClass == RAWKEY) && (buttonId == 27))) + ((msgClass == RAWKEY) && (buttonId == Common::KEYCODE_ESCAPE))) return; else if (msgClass == BUTTONUP) { if (buttonId == 0) { @@ -439,7 +439,7 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isIntera uint16 code = msg->_code; if (((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RIGHTBUTTON & qualifier)) || - ((msgClass == RAWKEY) && (code == 27))) + ((msgClass == RAWKEY) && (code == Common::KEYCODE_ESCAPE))) return; else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_LEFTBUTTON & qualifier)) { if ((mouseY >= _utils->vgaScaleY(171)) && (mouseY <= _utils->vgaScaleY(200))) { |