[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.49,1.50 gfx.cpp,2.21,2.22

[Max Horn]

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

Modified Files:
	object.cpp gfx.cpp 
Log Message:
fix banjo duel crash

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- object.cpp	12 Jan 2003 13:06:59 -0000	1.49
+++ object.cpp	12 Jan 2003 13:58:16 -0000	1.50
@@ -356,7 +356,7 @@
 	ypos = od->y_pos;
 
 	width = od->width >> 3;
-	height = od->height &= 0xF8;	// Ender
+	height = od->height &= 0xFFFFFFF8;	// Mask out last 3 bits
 
 	if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip)
 		return;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- gfx.cpp	11 Jan 2003 15:52:59 -0000	2.21
+++ gfx.cpp	12 Jan 2003 13:58:16 -0000	2.22
@@ -851,6 +851,7 @@
 void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int h,
 										 int stripnr, int numstrip, byte flag)
 {
+	assert(h > 0);
 	byte *backbuff_ptr, *bgbak_ptr, *smap_ptr;
 	int i;
 	byte *zplane_list[9];