[Scummvm-git-logs] scummvm master -> 995b83c546d2f4ffcb6c5d52ecc203ea4f5fd3fa

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
995b83c546 SCUMM: GUI: Allow quitting with ALT-X and ALT-Q combinations


Commit: 995b83c546d2f4ffcb6c5d52ecc203ea4f5fd3fa
    https://github.com/scummvm/scummvm/commit/995b83c546d2f4ffcb6c5d52ecc203ea4f5fd3fa
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-12-28T19:15:39+01:00

Commit Message:
SCUMM: GUI: Allow quitting with ALT-X and ALT-Q combinations

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 13794298a1f..f0fb3e9afea 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -125,12 +125,14 @@ void ScummEngine::parseEvent(Common::Event event) {
 		} else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == Common::KEYCODE_s) {
 			_res->resourceStats();
 		} else if (event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == Common::KEYCODE_x) {
-			if (_game.version < 8) {
-				if (isUsingOriginalGUI()) {
-					_keyPressed = event.kbd;
-				} else {
-					quitGame();
-				}
+			if (isUsingOriginalGUI()) {
+				_keyPressed = event.kbd;
+			} else {
+				quitGame();
+			}
+		} else if (event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == Common::KEYCODE_q) {
+			if (_game.version > 4 && _game.heversion == 0) {
+				quitGame();
 			}
 		} else {
 			// Normal key press, pass on to the game.