aboutsummaryrefslogtreecommitdiff
path: root/scumm/input.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-03-15 01:45:38 +0000
committerTravis Howell2005-03-15 01:45:38 +0000
commita3955f150c3840cc9254a36c8fceddabdfd86731 (patch)
treeba185db481c3975a96a12c6b6b62df18a2388a46 /scumm/input.cpp
parent1a26020fd207bba5cb56d919fb93efd02afde831 (diff)
downloadscummvm-rg350-a3955f150c3840cc9254a36c8fceddabdfd86731.tar.gz
scummvm-rg350-a3955f150c3840cc9254a36c8fceddabdfd86731.tar.bz2
scummvm-rg350-a3955f150c3840cc9254a36c8fceddabdfd86731.zip
VAR_CUTSCENEEXIT_KEY uses different value in NES maniac
svn-id: r17140
Diffstat (limited to 'scumm/input.cpp')
-rw-r--r--scumm/input.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/input.cpp b/scumm/input.cpp
index 827eb4c50c..43e5282201 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -400,7 +400,7 @@ void ScummEngine::processKbd(bool smushMode) {
saveloadkey = VAR(VAR_MAINMENU_KEY);
if (_lastKeyHit == VAR(VAR_CUTSCENEEXIT_KEY) ||
- (VAR(VAR_CUTSCENEEXIT_KEY) == 4 && _lastKeyHit == 27)) {
+ ((VAR(VAR_CUTSCENEEXIT_KEY) == 4 || VAR(VAR_CUTSCENEEXIT_KEY) == 64) && _lastKeyHit == 27)) {
// Skip cutscene (or active SMUSH video). For the V2 games, which
// normally use F4 for this, we add in a hack that makes escape work,
// too (just for convenience).