diff options
| author | Travis Howell | 2005-04-21 12:25:53 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-21 12:25:53 +0000 |
| commit | dace543c07947f874860f945dc15a35ab8b8b05e (patch) | |
| tree | 6a7327719e9126e355f5fbc2b180060db138d3ff | |
| parent | dd046c184e03feb0d513acf45495d63b595997c0 (diff) | |
| download | scummvm-rg350-dace543c07947f874860f945dc15a35ab8b8b05e.tar.gz scummvm-rg350-dace543c07947f874860f945dc15a35ab8b8b05e.tar.bz2 scummvm-rg350-dace543c07947f874860f945dc15a35ab8b8b05e.zip | |
Fix source clipping of rawWizImages in HE games.
Can get further in spyozon now.
svn-id: r17734
| -rw-r--r-- | scumm/wiz_he.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 323e5431d5..1194c626b0 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -343,12 +343,7 @@ void Wiz::copyRawWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int } int h = r1.height(); int w = r1.width(); - if (srcx < 0) { - src -= srcx; - } - if (srcy < 0) { - src -= srcy * srcw; - } + src += r1.left + r1.top * srcw; dst += r2.left + r2.top * dstw; while (h--) { const uint8 *p = src; @@ -916,7 +911,7 @@ void ScummEngine_v72he::displayWizImage(WizImage *pwi) { } uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, int xmapNum, const Common::Rect *clipBox, int flags, int dstResNum, int paletteNum) { - debug(1, "drawWizImage(resNum %d, x1 %d, y1 %d, flags 0x%X, xmapNum %d paletteNum %d)", resNum, x1, y1, flags, xmapNum, paletteNum); + debug(1, "drawWizImage(resNum %d, x1 %d, y1 %d, flags 0x%X, xmapNum %d dstResNum %d paletteNum %d)", resNum, x1, y1, flags, xmapNum, dstResNum, paletteNum); uint8 *dst = NULL; const uint8 *palPtr = NULL; if (_heversion >= 99) { |