diff options
author | Travis Howell | 2004-10-04 14:02:37 +0000 |
---|---|---|
committer | Travis Howell | 2004-10-04 14:02:37 +0000 |
commit | 292bd1a62b4f28538f92f79c210ae17ebf350884 (patch) | |
tree | 1f9cc8ac96353d0629e4861e8c40f327ab0a9b86 /scumm | |
parent | 1cb05366f8b3e59b450e57a02ee8e3966d0ddee0 (diff) | |
download | scummvm-rg350-292bd1a62b4f28538f92f79c210ae17ebf350884.tar.gz scummvm-rg350-292bd1a62b4f28538f92f79c210ae17ebf350884.tar.bz2 scummvm-rg350-292bd1a62b4f28538f92f79c210ae17ebf350884.zip |
Ooops, got reverted.
svn-id: r15409
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/gfx.cpp | 13 |
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; |