diff options
| author | Kirben | 2014-12-08 19:26:39 +1100 |
|---|---|---|
| committer | Kirben | 2014-12-08 19:26:39 +1100 |
| commit | 6e24e7df3b9c39b03d1652bdf34f275d7ed8c1fc (patch) | |
| tree | 27e8f9f67af3ab3d59dd49a8f3589337c991d4bd /engines/scumm/input.cpp | |
| parent | ecb1979245fb6695a68286a59f5eaf2c3677b579 (diff) | |
| parent | 962c8b4524f46bbc2394d7a80972db0a474221a3 (diff) | |
| download | scummvm-rg350-6e24e7df3b9c39b03d1652bdf34f275d7ed8c1fc.tar.gz scummvm-rg350-6e24e7df3b9c39b03d1652bdf34f275d7ed8c1fc.tar.bz2 scummvm-rg350-6e24e7df3b9c39b03d1652bdf34f275d7ed8c1fc.zip | |
Merge pull request #546 from segrax/V0_Demo
SCUMM: Maniac V0: Add support for D64 Demo Disk, Cleanup duplicate 'Talk...
Diffstat (limited to 'engines/scumm/input.cpp')
| -rw-r--r-- | engines/scumm/input.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 824dfec144..86048af57c 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -452,8 +452,16 @@ void ScummEngine_v2::processKeyboard(Common::KeyState lastKeyHit) { lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE); // F7 is used to skip cutscenes in the Commodote 64 version of Maniac Mansion } else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformC64) { - if (lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0)) - lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE); + // Demo always F7 to be pressed to restart + if (_game.features & GF_DEMO) { + if (_roomResource != 0x2D && lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0)) { + restart(); + return; + } + } else { + if (lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0)) + lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE); + } // 'B' is used to skip cutscenes in the NES version of Maniac Mansion } else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformNES) { if (lastKeyHit.keycode == Common::KEYCODE_b && lastKeyHit.hasFlags(Common::KBD_SHIFT)) |