[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.152,1.153 scummvm.cpp,2.582,2.583

Travis Howell kirben at users.sourceforge.net
Sat Feb 21 07:21:01 CET 2004


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

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

This is normal for earlier games


Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- script.cpp	21 Feb 2004 13:17:35 -0000	1.152
+++ script.cpp	21 Feb 2004 15:08:36 -0000	1.153
@@ -651,7 +651,9 @@
 
 	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 @@
 			}
 			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 @@
 	fetchScriptByte();
 	fetchScriptWord();
 	
-	// This is based on disassembly
+	// FIXME: why is this here? it doesn't seem to belong here?
 	VAR(VAR_OVERRIDE) = 0;
 }
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.582
retrieving revision 2.583
diff -u -d -r2.582 -r2.583
--- scummvm.cpp	21 Feb 2004 06:44:10 -0000	2.582
+++ scummvm.cpp	21 Feb 2004 15:08:36 -0000	2.583
@@ -1937,15 +1937,9 @@
 			_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;
 		}





More information about the Scummvm-git-logs mailing list