[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.169,1.170 scumm.cpp,1.112,1.113

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7742/scumm

Modified Files:
	script.cpp scumm.cpp 
Log Message:

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


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- script.cpp	2 Aug 2004 20:55:35 -0000	1.169
+++ script.cpp	3 Aug 2004 04:26:30 -0000	1.170
@@ -212,7 +212,8 @@
 		if (script == ss->number && ss->status != ssDead &&
 			(ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL)) {
 			if (ss->cutsceneOverride)
-				error("Script %d stopped with active cutscene/override", script);
+				if (_version >= 5)
+					error("Script %d stopped with active cutscene/override", script);
 			ss->number = 0;
 			ss->status = ssDead;
 			nukeArrays(script);
@@ -251,7 +252,8 @@
 		if (script == ss->number && ss->status != ssDead &&
 		    (ss->where == WIO_ROOM || ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)) {
 			if (ss->cutsceneOverride)
-				error("Object %d stopped with active cutscene/override", script);
+				if (_version >= 5)
+					error("Object %d stopped with active cutscene/override", script);
 			ss->number = 0;
 			ss->status = ssDead;
 			nukeArrays(script);
@@ -681,14 +683,14 @@
 
 	if (ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL) {
 		if (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 {
 		if (ss->cutsceneOverride) {
-			warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
+			if (_version >= 5)
+				warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
 			ss->cutsceneOverride = 0;
 		}
 	}
@@ -846,16 +848,17 @@
 	ss = vm.slot;
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
 		if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
-			if (ss->cutsceneOverride != 0) {
-				warning("Object %d stopped with active cutscene/override in exit", ss->number);
+			if (ss->cutsceneOverride) {
+				if (_version >= 5)
+					warning("Object %d stopped with active cutscene/override in exit", ss->number);
 				ss->cutsceneOverride = 0;
 			}
 			nukeArrays(i);
 			ss->status = ssDead;
 		} else if (ss->where == WIO_LOCAL) {
-			// 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);
+			if (ss->cutsceneOverride) {
+				if ( _version >= 5)
+					warning("Script %d stopped with active cutscene/override in exit", ss->number);
 				ss->cutsceneOverride = 0;
 			}
 			nukeArrays(i);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- scumm.cpp	2 Aug 2004 06:21:00 -0000	1.112
+++ scumm.cpp	3 Aug 2004 04:26:30 -0000	1.113
@@ -2164,16 +2164,15 @@
 
 	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;
 		}