Ooops, got reverted.

svn-id: r15409

1 files changed, 4 insertions, 9 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index b1d106bf1c..dd22ae2bfd 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -1385,10 +1385,8 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs, int startstrip) {
 	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 @@ void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y,
 
 	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;