From 59ac07dcd6db57e6a63739f78b09189759e9e921 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 13 Jul 2003 20:27:28 +0000
Subject: workaround for bug #770093 (Zak256 Crash inside of Sphinx)

svn-id: r8995
---
 scumm/scummvm.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 58721e2a19..e149ecc0e0 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1283,9 +1283,17 @@ void Scumm::startScene(int room, Actor * a, int objectNr) {
 				error("Object %d stopped with active cutscene/override in exit", ss->number);
 			_currentScript = 0xFF;
 		} else if (ss->where == WIO_LOCAL) {
-			// HACK to make Indy3 Demo work
-			if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && _roomResource == 3))
-				error("Script %d stopped with active cutscene/override in exit", ss->number);
+			if (ss->cutsceneOverride != 0) {
+				if (_gameId == GID_ZAK256 && _roomResource == 15 && ss->number == 202) {
+					// HACK to make Zak256 work (see bug #770093)
+					warning("Script %d stopped with active cutscene/override in exit", ss->number);
+				} else if (_gameId == GID_INDY3 && _roomResource == 3) {
+					// HACK to make Indy3 Demo work
+					warning("Script %d stopped with active cutscene/override in exit", ss->number);
+				} else {
+					error("Script %d stopped with active cutscene/override in exit", ss->number);
+				}
+			}
 			_currentScript = 0xFF;
 		}
 	}
-- 
cgit v1.2.3