[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.42,1.43

Max Horn fingolfin at users.sourceforge.net
Wed Jan 15 17:50:04 CET 2003


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

Modified Files:
	script_v6.cpp 
Log Message:
another change for Dig - still crashes a lot with my save games, though :-/

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- script_v6.cpp	16 Jan 2003 01:46:59 -0000	1.42
+++ script_v6.cpp	16 Jan 2003 01:49:33 -0000	1.43
@@ -1327,7 +1327,10 @@
 {
 	int box = pop();
 	Actor *a = derefActorSafe(pop(), "o6_isActorInBox");
-	push(checkXYInBoxBounds(box, a->x, a->y));
+	if(!a)
+		push(0); // FIXME: DIG seems to call this with an invalid actor id
+	else
+		push(checkXYInBoxBounds(box, a->x, a->y));
 }
 
 void Scumm_v6::o6_getActorLayer()





More information about the Scummvm-git-logs mailing list