[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.233,2.234

Max Horn fingolfin at users.sourceforge.net
Mon Feb 23 01:35:03 CET 2004


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

Modified Files:
	script_v2.cpp 
Log Message:
the code was still wrong

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.233
retrieving revision 2.234
diff -u -d -r2.233 -r2.234
--- script_v2.cpp	23 Feb 2004 01:10:05 -0000	2.233
+++ script_v2.cpp	23 Feb 2004 09:21:22 -0000	2.234
@@ -1122,12 +1122,10 @@
 	if (script == 0)
 		script = vm.slot[_currentScript].number;
 
-	if (_currentScript != 0) {
-		if (vm.slot[_currentScript].number == script) 
-			stopObjectCode();
-	} else {
+	if (_currentScript != 0 && vm.slot[_currentScript].number == script)
+		stopObjectCode();
+	else
 		stopScript(script);
-	}
 }
 
 void ScummEngine_v2::o2_panCameraTo() {





More information about the Scummvm-git-logs mailing list