aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2008-01-02 11:25:17 +0000
committerTravis Howell2008-01-02 11:25:17 +0000
commit01c611385e1f84ee45925e4f2011d50a5351ba9c (patch)
tree50d03e9e31e387f6aca8f86525f27f883a106587 /engines
parent977c9fb5f338780d3886b6695c8082a98381ab00 (diff)
downloadscummvm-rg350-01c611385e1f84ee45925e4f2011d50a5351ba9c.tar.gz
scummvm-rg350-01c611385e1f84ee45925e4f2011d50a5351ba9c.tar.bz2
scummvm-rg350-01c611385e1f84ee45925e4f2011d50a5351ba9c.zip
Fix regression when skipping cutscenes in Maniac Mansion (C64).
svn-id: r30144
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/input.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index e2ba127e5e..b53867ca3d 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -495,7 +495,8 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
abortCutscene();
// FIXME: Is the following line really necessary?
- _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
+ if (VAR_CUTSCENEEXIT_KEY != 0xFF)
+ _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
} else if (lastKeyHit.ascii == '[' || lastKeyHit.ascii == ']') { // Change music volume
int vol = ConfMan.getInt("music_volume") / 16;