[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.360,2.361

[Travis Howell]

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

Modified Files:
	gfx.cpp 
Log Message:

Ooops, got reverted.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.360
retrieving revision 2.361
diff -u -d -r2.360 -r2.361
--- gfx.cpp	4 Oct 2004 13:49:30 -0000	2.360
+++ gfx.cpp	4 Oct 2004 14:02:37 -0000	2.361
@@ -1385,10 +1385,8 @@
 	byte *mask_ptr;
 	const byte *zplane_list[9];
 
-	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
-
-	if (bmap_ptr == NULL)
-		error("Gdi::drawBMAPBg: Room %d has no compressed bitmap?", _vm->_roomResource);
+	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	assert(bmap_ptr);
 
 	code = *bmap_ptr++;
 
@@ -1430,11 +1428,8 @@
 
 	warning("drawBMAPObject() called");
 
-	bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8;
-	if (bmap_ptr == NULL) {
-		error("Gdi::drawBMAPObject: No image for item %d?", obj);
-		return;
-	}
+	bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
+	assert(bmap_ptr);
 
 	byte code = *ptr++;
 	int scrX = _vm->_screenStartStrip * 8;