[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.343,2.344 object.cpp,1.195,1.196

[Travis Howell]

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

Modified Files:
	gfx.cpp object.cpp 
Log Message:

Revert, just made matters worse.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.343
retrieving revision 2.344
diff -u -d -r2.343 -r2.344
--- gfx.cpp	27 Sep 2004 01:35:19 -0000	2.343
+++ gfx.cpp	27 Sep 2004 07:32:48 -0000	2.344
@@ -1219,7 +1219,8 @@
 		sx = 0;
 	}
 
-	while (numstrip && sx < _numStrips && x * 8 < width) {
+	// FIXME Still not been calculated correctly
+	while (numstrip && sx < _numStrips && x * 8 < MAX(_vm->_roomWidth, (int) vs->w)) {
 		CHECK_HEAP;
 
 		if (y < vs->tdirty[sx])

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- object.cpp	27 Sep 2004 01:35:19 -0000	1.195
+++ object.cpp	27 Sep 2004 07:32:49 -0000	1.196
@@ -495,7 +495,7 @@
 		if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)
 			gdi.drawBMAPObject(ptr, &virtscr[0], obj, od.x_pos * 8, od.y_pos * 8, od.width * 8, od.height * 8);
 		else
-			gdi.drawBitmap(ptr, &virtscr[0], x, ypos, _roomWidth, height, x - xpos, numstrip, flags);
+			gdi.drawBitmap(ptr, &virtscr[0], x, ypos, width * 8, height, x - xpos, numstrip, flags);
 	}
 }