[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.413,1.414

Travis Howell kirben at users.sourceforge.net
Thu Oct 7 23:57:08 CEST 2004


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

Modified Files:
	script_v6.cpp 
Log Message:

Small correction
Ensure object exists, before pushing data.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -d -r1.413 -r1.414
--- script_v6.cpp	4 Oct 2004 04:04:36 -0000	1.413
+++ script_v6.cpp	8 Oct 2004 06:52:08 -0000	1.414
@@ -2709,18 +2709,22 @@
 		break;
 	case 207:
 		i = getObjectIndex(args[1]);
+		assert(i);
 		push(_objs[i].x_pos);
 		break;
 	case 208:
 		i = getObjectIndex(args[1]);
+		assert(i);
 		push(_objs[i].y_pos);
 		break;
 	case 209:
 		i = getObjectIndex(args[1]);
+		assert(i);
 		push(_objs[i].width);
 		break;
 	case 210:
 		i = getObjectIndex(args[1]);
+		assert(i);
 		push(_objs[i].height);
 		break;
 	case 211:
@@ -2931,7 +2935,7 @@
 		state = 1;
 
 	int objnum = getObjectIndex(object);
-	if (objnum == 0)
+	if (objnum == -1)
 		return;
 
 	if (x != -1) {





More information about the Scummvm-git-logs mailing list