diff options
| author | Travis Howell | 2005-04-16 05:18:59 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-16 05:18:59 +0000 |
| commit | 2b6bdb6119679cef4354ad25fb1111eee268fa45 (patch) | |
| tree | cec81ebd97136b3787606dc2e7c25aa7ab13fa80 /scumm/wiz_he.cpp | |
| parent | c810139b72939048da3d9acf4e2fb97d1790459d (diff) | |
| download | scummvm-rg350-2b6bdb6119679cef4354ad25fb1111eee268fa45.tar.gz scummvm-rg350-2b6bdb6119679cef4354ad25fb1111eee268fa45.tar.bz2 scummvm-rg350-2b6bdb6119679cef4354ad25fb1111eee268fa45.zip | |
DstResNum state is always zero.
svn-id: r17611
Diffstat (limited to 'scumm/wiz_he.cpp')
| -rw-r--r-- | scumm/wiz_he.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 0839784a05..e09f386476 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -960,7 +960,7 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in return NULL; } - uint32 cw, ch; + int32 cw, ch; if (flags & kWIFBlitToMemBuffer) { dst = (uint8 *)malloc(width * height); int color = 255; // FIXME: should be (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5; @@ -971,12 +971,10 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in if (dstResNum) { uint8 *dstPtr = getResourceAddress(rtImage, dstResNum); assert(dstPtr); - wizh = findWrappedBlock(MKID('WIZH'), dstPtr, 0, 0); - assert(wizh); - cw = READ_LE_UINT32(wizh + 0x4); - ch = READ_LE_UINT32(wizh + 0x8); - dst = findWrappedBlock(MKID('WIZD'), dstPtr, state, 0); + dst = findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0); assert(dst); + + getWizImageDim(dstResNum, 0, cw, ch); } else { VirtScreen *pvs = &virtscr[kMainVirtScreen]; if (flags & kWIFMarkBufferDirty) { @@ -1200,7 +1198,7 @@ void ScummEngine_v72he::drawWizPolygon(int resNum, int state, int id, int flags, if (dstResNum) { uint8 *dstPtr = getResourceAddress(rtImage, dstResNum); assert(dstPtr); - dst = findWrappedBlock(MKID('WIZD'), dstPtr, state, 0); + dst = findWrappedBlock(MKID('WIZD'), dstPtr, 0, 0); assert(dst); getWizImageDim(dstResNum, 0, wizW, wizH); |