[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.97,1.98

Max Horn fingolfin at users.sourceforge.net
Wed May 21 15:08:15 CEST 2003


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

Modified Files:
	script.cpp 
Log Message:
cutscene override fix for V3 games (bug #731985)

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- script.cpp	21 May 2003 14:00:06 -0000	1.97
+++ script.cpp	21 May 2003 21:41:27 -0000	1.98
@@ -1104,6 +1104,7 @@
 	fetchScriptByte();
 	fetchScriptWord();
 	
+	// FIXME: why is this here? it doesn't seem to belong here?
 	VAR(VAR_OVERRIDE) = 0;
 }
 
@@ -1115,5 +1116,7 @@
 
 	vm.cutScenePtr[idx] = 0;
 	vm.cutSceneScript[idx] = 0;
-	VAR(VAR_OVERRIDE) = 0;
+	
+	if (!(_features & GF_AFTER_V3))
+		VAR(VAR_OVERRIDE) = 0;
 }





More information about the Scummvm-git-logs mailing list