diff options
| author | Max Horn | 2007-06-29 22:39:52 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-29 22:39:52 +0000 |
| commit | 314ef72bb188240bb145e13c620310af142b693e (patch) | |
| tree | d9a95fd300a31cde27fcc9e3ac460661545bbf77 /engines/scumm | |
| parent | 328858d454cfdd727a7eecdf6ebe8952a37f735c (diff) | |
| download | scummvm-rg350-314ef72bb188240bb145e13c620310af142b693e.tar.gz scummvm-rg350-314ef72bb188240bb145e13c620310af142b693e.tar.bz2 scummvm-rg350-314ef72bb188240bb145e13c620310af142b693e.zip | |
SCUMM: Handle all triggers for the debugger console in the same spot, to ensure uniform behavior
svn-id: r27777
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/input.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 163bde01aa..ae93507df8 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -79,7 +79,8 @@ void ScummEngine::parseEvents() { _fastMode ^= 1; } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'g') { _fastMode ^= 2; - } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'd') { + } else if ((event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 'd') || + event.kbd.ascii == '~' || event.kbd.ascii == '#') { _debugger->attach(); } else if (event.kbd.flags == Common::KBD_CTRL && event.kbd.keycode == 's') { _res->resourceStats(); @@ -559,9 +560,6 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { if (VAR_CHARINC != 0xFF) VAR(VAR_CHARINC) = _defaultTalkDelay; - } else if (lastKeyHit.ascii == '~' || lastKeyHit.ascii == '#') { // Debug console - _debugger->attach(); - } else { // FIXME: Possibly convert even more keycode/ascii pairs to their SCUMM counterparts? if (lastKeyHit.keycode >= Common::KEYCODE_F1 && lastKeyHit.keycode <= Common::KEYCODE_F9) { |