diff options
Diffstat (limited to 'engines/scumm/input.cpp')
| -rw-r--r-- | engines/scumm/input.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 86048af57c..6ef7e4d7f4 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -23,9 +23,8 @@ #include "common/config-manager.h" #include "common/events.h" #include "common/system.h" - -#include "gui/message.h" -#include "gui/gui-manager.h" +#include "common/translation.h" +#include "audio/mixer.h" #include "scumm/debugger.h" #include "scumm/dialogs.h" @@ -129,6 +128,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; @@ -568,9 +575,9 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { lastKeyHit.hasFlags(Common::KBD_CTRL)) { _snapScroll ^= 1; if (_snapScroll) { - messageDialog("Snap scroll on"); + messageDialog(_("Snap scroll on")); } else { - messageDialog("Snap scroll off"); + messageDialog(_("Snap scroll off")); } if (VAR_CAMERA_FAST_X != 0xFF) @@ -583,7 +590,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { vol--; // Display the music volume - ValueDisplayDialog dlg("Music volume: ", 0, 16, vol, ']', '['); + ValueDisplayDialog dlg(_("Music volume: "), 0, 16, vol, ']', '['); vol = runDialog(dlg); vol *= 16; @@ -600,7 +607,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { _defaultTalkDelay++; // Display the talk speed - ValueDisplayDialog dlg("Subtitle speed: ", 0, 9, 9 - _defaultTalkDelay, '+', '-'); + ValueDisplayDialog dlg(_("Subtitle speed: "), 0, 9, 9 - _defaultTalkDelay, '+', '-'); _defaultTalkDelay = 9 - runDialog(dlg); // Save the new talkspeed value to ConfMan |