aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2009-07-15 05:00:59 +0000
committerTravis Howell2009-07-15 05:00:59 +0000
commit9c06549d318be73de69e7e42ccbe49f99bbdc7cd (patch)
tree4668c971ffd0c0d4e6d279aa23e2455d14fb028d /engines
parentb159517dc3f55f3589bf9b7727607e7d216fde52 (diff)
downloadscummvm-rg350-9c06549d318be73de69e7e42ccbe49f99bbdc7cd.tar.gz
scummvm-rg350-9c06549d318be73de69e7e42ccbe49f99bbdc7cd.tar.bz2
scummvm-rg350-9c06549d318be73de69e7e42ccbe49f99bbdc7cd.zip
Hack is no longer required, due to revision 42498.
svn-id: r42499
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/script.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 78f7fb0453..4d9447bee5 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1367,17 +1367,6 @@ void ScummEngine::abortCutscene() {
VAR(VAR_OVERRIDE) = 1;
vm.cutScenePtr[idx] = 0;
-
- // HACK to fix issues with SMUSH and the way it does keyboard handling.
- // In particular, normally abortCutscene() is being called while no
- // scripts are active. But SMUSH runs from *inside* the script engine.
- // And it calls abortCutscene() if ESC is pressed... not good.
- // Proper fix might be to let SMUSH/INSANE run from outside the script
- // engine but that would require lots of changes and may actually have
- // negative effects, too. So we cheat here, to fix bug #751670.
- if (_game.version == 7)
- getScriptEntryPoint();
-
}
}