aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-11-23 03:08:40 +0000
committerTravis Howell2004-11-23 03:08:40 +0000
commitbc34d0d5624d79e84e3d797724ece85b80102e40 (patch)
treefd6e03c9a1e5d540011aa891a05bac4131782a92 /scumm
parentd75cc2386d1b68f0ce3870e4d4f3bdafa04b36c5 (diff)
downloadscummvm-rg350-bc34d0d5624d79e84e3d797724ece85b80102e40.tar.gz
scummvm-rg350-bc34d0d5624d79e84e3d797724ece85b80102e40.tar.bz2
scummvm-rg350-bc34d0d5624d79e84e3d797724ece85b80102e40.zip
Revert small part of recent WizImage changes, caused regressions.
svn-id: r15867
Diffstat (limited to 'scumm')
-rw-r--r--scumm/gfx.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 051d52823b..a98f4cf13e 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -1478,6 +1478,7 @@ void Gdi::copyWizImage(uint8 *dst, const uint8 *src, int dstw, int dsth, int src
if (calcClipRects(dstw, dsth, srcx, srcy, srcw, srch, rect, r1, r2)) {
for (int i = 0; i < 256; i++)
_wizImagePalette[i] = i;
+ dst += r2.left + r2.top * dstw;
decompressWizImage(dst, dstw, r2, src, r1);
}
}
@@ -1527,7 +1528,7 @@ void Gdi::decompressWizImage(uint8 *dst, int dstPitch, const Common::Rect &dstRe
uint16 off;
int color;
- dstPtr = dst + dstRect.left + dstRect.top * dstPitch;
+ dstPtr = dst;
dataPtr = src;
// Skip over the first 'srcRect->top' lines in the data