From 3b734082c4cd5e3519fe0260eb12e046ef9b3446 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 29 Jan 2016 23:08:27 +0100
Subject: SCUMM: Allow Alt-x to be used to quit SCUMM games.

This includes a TODO to check which SCUMM games actually exhibit this behavior
originally. cbd867329e018d7eca12b3a8842e52b8db9f494d added this behavior to our
backend code initially.
---
 engines/scumm/input.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'engines/scumm/input.cpp')

diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 3ce053f6bc..1234eda3cc 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -130,6 +130,14 @@ void ScummEngine::parseEvent(Common::Event event) {
 			_debugger->attach();
 		} else if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_s) {
 			_res->resourceStats();
+		} else if (event.kbd.hasFlags(Common::KBD_ALT) && event.kbd.keycode == Common::KEYCODE_x) {
+			// TODO: Some SCUMM games quit when Alt-x is pressed. However, not
+			// all of them seem to exhibit this behavior. LordHoto found that
+			// the Loom manual does not mention this hotkey. On the other hand
+			// the Sam&Max manual mentions that Alt-x does so on "most"
+			// platforms. We should really check which games exhibit this
+			// behavior and only use it for them.
+			quitGame();
 		} else {
 			// Normal key press, pass on to the game.
 			_keyPressed = event.kbd;
-- 
cgit v1.2.3