This is normal for earlier games

svn-id: r12967

2 files changed, 8 insertions, 12 deletions

diff --git a/scumm/script.cpp b/scumm/script.cpp
index ae5ea94bc3..9be01fb294 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -651,7 +651,9 @@ void ScummEngine::stopObjectCode() {
 
 	if (ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL) {
 		if (ss->cutsceneOverride) {
-			warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
+			// Earlier games only checked global scripts at this point
+			if (_version >= 5)
+				warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
 			ss->cutsceneOverride = 0;
 		}
 	} else {
@@ -819,8 +821,8 @@ void ScummEngine::killScriptsAndResources() {
 			}
 			ss->status = ssDead;
 		} else if (ss->where == WIO_LOCAL) {
-			// HACK to make Indy3 Demo work
-			if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && _roomResource == 3)) {
+			// Earlier games only checked global scripts at this point
+			if (ss->cutsceneOverride != 0 && _version >= 5) {
 				warning("Script %d stopped with active cutscene/override in exit", ss->number);
 				ss->cutsceneOverride = 0;
 			}
@@ -1107,7 +1109,7 @@ void ScummEngine::beginOverride() {
 	fetchScriptByte();
 	fetchScriptWord();
 	
-	// This is based on disassembly
+	// FIXME: why is this here? it doesn't seem to belong here?
 	VAR(VAR_OVERRIDE) = 0;
 }
 
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index b9a3875750..c6b747ee5a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1937,15 +1937,9 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
 			_currentScript = 0xFF;
 		} else if (ss->where == WIO_LOCAL) {
 			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 && (_features & GF_OLD_BUNDLE) && _roomResource == 3) {
-					// HACK to make Indy3 Demo work
-					warning("Script %d stopped with active cutscene/override in exit", ss->number);
-				} else {
+				// Earlier games only checked global scripts at this point
+				if (_version >= 5)
 					error("Script %d stopped with active cutscene/override in exit", ss->number);
-				}
 			}
 			_currentScript = 0xFF;
 		}