diff options
| author | Max Horn | 2003-06-26 01:46:41 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-26 01:46:41 +0000 |
| commit | 7a79ef8f5f94d9523d9aa8fb1999cbc58512b389 (patch) | |
| tree | 9129927ca9a76d506f57aecf4d6503b660bdcf1a /scumm/verbs.cpp | |
| parent | 3c296b36b7a2cbf9bd049e65810f1d5c43fe6573 (diff) | |
| download | scummvm-rg350-7a79ef8f5f94d9523d9aa8fb1999cbc58512b389.tar.gz scummvm-rg350-7a79ef8f5f94d9523d9aa8fb1999cbc58512b389.tar.bz2 scummvm-rg350-7a79ef8f5f94d9523d9aa8fb1999cbc58512b389.zip | |
added getOBIMFromObject and getObjectImage methods; changed code to use those
svn-id: r8651
Diffstat (limited to 'scumm/verbs.cpp')
| -rw-r--r-- | scumm/verbs.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 3ad2b92a08..ea9d361e81 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -455,7 +455,7 @@ void Scumm::drawVerbBitmap(int verb, int x, int y) { imgw = (*(obim + size + 11)); imgh = (*(obim + size + 17)) >> 3; - imptr = (obim + 8); + imptr = getObjectImage(obim, 1); } else { imhd = (const ImageHeader *)findResourceData(MKID('IMHD'), obim); if (_version >= 7) { @@ -465,21 +465,7 @@ void Scumm::drawVerbBitmap(int verb, int x, int y) { imgw = READ_LE_UINT16(&imhd->old.width) >> 3; imgh = READ_LE_UINT16(&imhd->old.height) >> 3; } - - if (_version == 8) { - warning("drawVerbBitmap(%d, %d, %d)", verb, x, y); - imptr = findResource(MKID('IMAG'), obim); - assert(imptr); - imptr = findResource(MKID('WRAP'), imptr); - assert(imptr); - imptr = findResource(MKID('OFFS'), imptr); - assert(imptr); - // Get the address of the second SMAP (corresponds to IM01) - imptr += READ_LE_UINT32(imptr + 12); - } else - imptr = findResource(MKID('IM01'), obim); - if (!imptr) - error("No image for verb %d", verb); + imptr = getObjectImage(obim, 1); } assert(imptr); if (_version == 1) { |