Shouldn't error out in early scumm 1 - 4 games.

svn-id: r14454

1 files changed, 5 insertions, 6 deletions

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index a9c5ce7e17..0c820cc6ec 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2164,16 +2164,15 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
 
 	if (_currentScript != 0xFF) {
 		if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
-			if (ss->cutsceneOverride != 0)
+			if (ss->cutsceneOverride && _version >= 5)
 				error("Object %d stopped with active cutscene/override in exit", ss->number);
+
 			nukeArrays(_currentScript);
 			_currentScript = 0xFF;
 		} else if (ss->where == WIO_LOCAL) {
-			if (ss->cutsceneOverride != 0) {
-				// Earlier games only checked global scripts at this point
-				if (_version >= 5)
-					error("Script %d stopped with active cutscene/override in exit", ss->number);
-			}
+			if (ss->cutsceneOverride && _version >= 5)
+				error("Script %d stopped with active cutscene/override in exit", ss->number);
+
 			nukeArrays(_currentScript);
 			_currentScript = 0xFF;
 		}