From e2f851c8501f4ff8643ca6693cd0e3b103597ccb Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 15 Dec 2003 20:33:40 +0000
Subject: Fix for bug #751670, thanks to MadMoose (I am not quite happy with
 the situation, but hey, at least this helps :-)

svn-id: r11662
---
 scumm/script.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'scumm/script.cpp')

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();
+
 	}
 }
 
-- 
cgit v1.2.3