diff options
author | Max Horn | 2003-12-15 20:33:40 +0000 |
---|---|---|
committer | Max Horn | 2003-12-15 20:33:40 +0000 |
commit | e2f851c8501f4ff8643ca6693cd0e3b103597ccb (patch) | |
tree | 9302244e8eaedab3d7a84693679295c08095d2fc /scumm/script.cpp | |
parent | 7fcfd00d1cbb54e54556d11d8946584f1628456e (diff) | |
download | scummvm-rg350-e2f851c8501f4ff8643ca6693cd0e3b103597ccb.tar.gz scummvm-rg350-e2f851c8501f4ff8643ca6693cd0e3b103597ccb.tar.bz2 scummvm-rg350-e2f851c8501f4ff8643ca6693cd0e3b103597ccb.zip |
Fix for bug #751670, thanks to MadMoose (I am not quite happy with the situation, but hey, at least this helps :-)
svn-id: r11662
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r-- | scumm/script.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 6cf7673d3e..0058b24274 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -1130,6 +1130,16 @@ void ScummEngine::abortCutscene() { VAR(VAR_OVERRIDE) = 1; vm.cutScenePtr[vm.cutSceneStackPointer] = 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. + getScriptEntryPoint(); + } } |