[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.71,2.71.2.1 object.cpp,1.86,1.86.2.1

[Max Horn]

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

Modified Files:
      Tag: branch-0-4-0
	gfx.cpp object.cpp 
Log Message:
applied the COMI crash fix from the trunk

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.71
retrieving revision 2.71.2.1
diff -u -d -r2.71 -r2.71.2.1
--- gfx.cpp	4 May 2003 03:27:55 -0000	2.71
+++ gfx.cpp	15 May 2003 18:07:51 -0000	2.71.2.1
@@ -484,6 +484,8 @@
 	byte *backbuff_ptr, *bgbak_ptr;
 	int offs, numLinesToProcess;
 
+	assert(0 <= strip && strip < _numStrips);
+
 	if (top < vs->tdirty[strip])
 		vs->tdirty[strip] = top;
 

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.86
retrieving revision 1.86.2.1
diff -u -d -r1.86 -r1.86.2.1
--- object.cpp	4 May 2003 13:09:42 -0000	1.86
+++ object.cpp	15 May 2003 18:07:52 -0000	1.86.2.1
@@ -1655,7 +1655,7 @@
 		right = vs->width;
 
 	left_strip = left >> 3;
-	right_strip = (right >> 3) + 1;
+	right_strip = (right - 1) >> 3;
 
 	if (left_strip < 0)
 		left_strip = 0;