[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.90,1.91

Max Horn fingolfin at users.sourceforge.net
Sun May 18 16:20:24 CEST 2003


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

Modified Files:
	script.cpp 
Log Message:
oops

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- script.cpp	18 May 2003 21:03:56 -0000	1.90
+++ script.cpp	18 May 2003 23:19:43 -0000	1.91
@@ -90,7 +90,7 @@
 	ss = vm.slot;
 	for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
 		if (script == ss->number && ss->status != ssDead &&
-			(ss->where == WIO_GLOBAL && ss->where == WIO_LOCAL)) {
+			(ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL)) {
 			if (ss->cutsceneOverride)
 				error("Script %d stopped with active cutscene/override", script);
 			ss->number = 0;





More information about the Scummvm-git-logs mailing list