diff options
| author | Johannes Schickel | 2016-01-29 23:14:01 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-01-29 23:19:08 +0100 |
| commit | 94cd15bb3e07950bd98f8133e552707a33729e47 (patch) | |
| tree | 9380c30cc669b3a51d57478bfa6283e86e0d0ebb | |
| parent | 3b734082c4cd5e3519fe0260eb12e046ef9b3446 (diff) | |
| download | scummvm-rg350-94cd15bb3e07950bd98f8133e552707a33729e47.tar.gz scummvm-rg350-94cd15bb3e07950bd98f8133e552707a33729e47.tar.bz2 scummvm-rg350-94cd15bb3e07950bd98f8133e552707a33729e47.zip | |
SDL: Do not quit on Alt-x.
This was originally added in cbd867329e018d7eca12b3a8842e52b8db9f494d to
support this LucasArts game hotkey. However, Alt-x is used by other
engines as hotkey. Most notably AGI's Leisure Suit Larry in the Land of the
Lounge Lizards uses it to skip the age protection. Since we handle Alt-x
internally in SCUMM now there is no need to keep this around in our backend
code.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | backends/events/sdl/sdl-events.cpp | 9 |
3 files changed, 7 insertions, 8 deletions
@@ -19,6 +19,10 @@ For a more comprehensive changelog of the latest experimental code, see: General: - Updated Munt MT-32 emulation code to version 1.5.0. + SDL: + - Alt-x no longer quits ScummVM on platforms exhibiting this behavior + before. A notable example is our Windows port. + 3 Skulls of the Toltecs: - Improved AdLib music support. @@ -1487,7 +1487,7 @@ other games. Ctrl-F5 - Displays the Global Menu Cmd-q - Quit (Mac OS X) Ctrl-q - Quit (other unices including Linux) - Ctrl-z OR Alt-x - Quit (other platforms) + Ctrl-z - Quit (other platforms) Ctrl-u - Mute all sounds Ctrl-m - Toggle mouse capture Ctrl-Alt 1-8 - Switch between graphics filters diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp index 745f398be6..81ddd5ac11 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 |