[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.111,1.112

Max Horn fingolfin at users.sourceforge.net
Wed May 14 03:15:04 CEST 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
V8 fix

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- script_v6.cpp	13 May 2003 23:42:40 -0000	1.111
+++ script_v6.cpp	14 May 2003 10:14:05 -0000	1.112
@@ -1134,9 +1134,11 @@
 	a->putActor(0, 0, room);
 	_egoPositioned = false;
 
-	VAR(VAR_WALKTO_OBJ) = obj;
+	if (VAR_WALKTO_OBJ != 0xFF)
+		VAR(VAR_WALKTO_OBJ) = obj;
 	startScene(a->room, a, obj);
-	VAR(VAR_WALKTO_OBJ) = 0;
+	if (VAR_WALKTO_OBJ != 0xFF)
+		VAR(VAR_WALKTO_OBJ) = 0;
 
 	/* startScene maybe modifies VAR_EGO, i hope not */
 





More information about the Scummvm-git-logs mailing list