[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.229,1.230 scumm.h,1.341,1.342

[Travis Howell]

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

Modified Files:
	script_v6.cpp scumm.h 
Log Message:

Add correct solution for drawObjectQue[] overflow in lawn mower mini games of puttputt


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- script_v6.cpp	30 Dec 2003 05:39:57 -0000	1.229
+++ script_v6.cpp	30 Dec 2003 06:24:47 -0000	1.230
@@ -2958,7 +2958,12 @@
 		int objnum = getObjectIndex(object);
 		if (objnum == -1)
 			return;
-		setObjectState(object, state, x, y);
+		if (objnum != -1) {
+			_objs[objnum].x_pos = x * 8;
+			_objs[objnum].y_pos = y * 8;
+		}
+		putState(object, state);
+
 		drawObject(objnum, 0);
 		warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state);
 		

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- scumm.h	30 Dec 2003 05:39:57 -0000	1.341
+++ scumm.h	30 Dec 2003 06:24:47 -0000	1.342
@@ -913,7 +913,7 @@
 	void removeBlastObject(BlastObject *eo);
 
 	int _drawObjectQueNr;
-	byte _drawObjectQue[700];
+	byte _drawObjectQue[200];
 	byte _palManipStart, _palManipEnd;
 	uint16 _palManipCounter;
 	byte *_palManipPalette;