[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.67,1.68 scummvm.cpp,2.108,2.109

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21630

Modified Files:
	script.cpp scummvm.cpp 
Log Message:
hack to get Indydemo to work

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- script.cpp	28 Apr 2003 03:13:48 -0000	1.67
+++ script.cpp	28 Apr 2003 16:57:52 -0000	1.68
@@ -752,11 +752,12 @@
 
 	for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
 		if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
-			if (ss->cutsceneOverride)
+			if (ss->cutsceneOverride != 0)
 				error("Object %d stopped with active cutscene/override in exit", ss->number);
 			ss->status = ssDead;
 		} else if (ss->where == WIO_LOCAL) {
-			if (ss->cutsceneOverride)
+			// 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);
 			ss->status = ssDead;
 		}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.108
retrieving revision 2.109
diff -u -d -r2.108 -r2.109
--- scummvm.cpp	28 Apr 2003 13:59:57 -0000	2.108
+++ scummvm.cpp	28 Apr 2003 16:57:53 -0000	2.109
@@ -730,17 +730,17 @@
 	fadeOut(_switchRoomEffect2);
 	_newEffect = _switchRoomEffect;
 
+	ScriptSlot *ss =  &vm.slot[_currentScript];
+
 	if (_currentScript != 0xFF) {
-		if (vm.slot[_currentScript].where == WIO_ROOM ||
-				vm.slot[_currentScript].where == WIO_FLOBJECT) {
-			if (vm.slot[_currentScript].cutsceneOverride != 0)
-				error("Object %d stopped with active cutscene/override in exit",
-							vm.slot[_currentScript].number);
+		if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
+			if (ss->cutsceneOverride != 0)
+				error("Object %d stopped with active cutscene/override in exit", ss->number);
 			_currentScript = 0xFF;
-		} else if (vm.slot[_currentScript].where == WIO_LOCAL) {
-			if (vm.slot[_currentScript].cutsceneOverride != 0)
-				error("Script %d stopped with active cutscene/override in exit",
-							vm.slot[_currentScript].number);
+		} 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);
 			_currentScript = 0xFF;
 		}
 	}