diff options
| author | Eugene Sandulenko | 2016-02-01 10:35:13 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-02-01 10:35:13 +0100 |
| commit | 68ff933206e091f0cd9712a903228cb9d0801db6 (patch) | |
| tree | 81bfe44dce3610538dde25f70f3d9eda553e9265 /backends/events | |
| parent | 7b521edac778b0a0369493054b4810da87d22435 (diff) | |
| parent | 94cd15bb3e07950bd98f8133e552707a33729e47 (diff) | |
| download | scummvm-rg350-68ff933206e091f0cd9712a903228cb9d0801db6.tar.gz scummvm-rg350-68ff933206e091f0cd9712a903228cb9d0801db6.tar.bz2 scummvm-rg350-68ff933206e091f0cd9712a903228cb9d0801db6.zip | |
Merge pull request #657 from lordhoto/scumm-alt-x
ALL: Handle Alt-x internally in SCUMM.
Diffstat (limited to 'backends/events')
| -rw-r--r-- | backends/events/sdl/sdl-events.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index d6880d8e65..7b56a0a955 100644 --- a/backends/events/sdl/sdl-events.cpp +++ b/backends/events/sdl/sdl-events.cpp @@ -545,8 +545,8 @@ bool SdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) { return true; } #else - // Ctrl-z and Alt-X quit - if ((event.kbd.hasFlags(Common::KBD_CTRL) && ev.key.keysym.sym == 'z') || (event.kbd.hasFlags(Common::KBD_ALT) && ev.key.keysym.sym == 'x')) { + // Ctrl-z quits + if ((event.kbd.hasFlags(Common::KBD_CTRL) && ev.key.keysym.sym == 'z')) { event.type = Common::EVENT_QUIT; return true; } @@ -603,11 +603,6 @@ bool SdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) { #if defined(MACOSX) if ((mod & KMOD_META) && ev.key.keysym.sym == 'q') return false; // On Macintosh, Cmd-Q quits -#elif defined(POSIX) - // Control Q has already been handled above -#else - if ((mod & KMOD_ALT) && ev.key.keysym.sym == 'x') - return false; // Alt-x quit #endif // If we reached here, this isn't an event handled by handleKeyDown(), thus |