[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.358,2.359

[Travis Howell]

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

Modified Files:
	gfx.cpp 
Log Message:

Add warning


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.358
retrieving revision 2.359
diff -u -d -r2.358 -r2.359
--- gfx.cpp	4 Oct 2004 12:16:51 -0000	2.358
+++ gfx.cpp	4 Oct 2004 12:38:52 -0000	2.359
@@ -1385,19 +1385,19 @@
 	byte *mask_ptr;
 	const byte *zplane_list[9];
 
-	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
 
-	if (bmap_ptr == NULL) {
+	if (bmap_ptr == NULL)
 		error("Gdi::drawBMAPBg: Room %d has no compressed bitmap?", _vm->_roomResource);
-		return;
-	}
 
 	code = *bmap_ptr++;
 
 	// TODO: The following few lines more or less duplicate decompressBitmap(), only
 	// for an area spanning multiple strips. In particular, the codecs 13 & 14
 	// in decompressBitmap call drawStripHE()
-	if ((code >= 134 && code <= 138) || (code >= 144 && code <= 148)) {
+	if (code == 150) {
+		warning("drawBMAPBg: case 150 unhandled");
+	} else if ((code >= 134 && code <= 138) || (code >= 144 && code <= 148)) {
 		_decomp_shr = code % 10;
 		_decomp_mask = 0xFF >> (8 - _decomp_shr);
 
@@ -1430,7 +1430,7 @@
 
 	warning("drawBMAPObject() called");
 
-	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
 	if (bmap_ptr == NULL) {
 		error("Gdi::drawBMAPObject: No image for item %d?", obj);
 		return;