diff options
| author | Travis Howell | 2007-03-12 23:03:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2007-03-12 23:03:30 +0000 |
| commit | 1e8047a5d221cb9328bfa13efa9460d51d3bfdc4 (patch) | |
| tree | 1356cf59d1843adb30ed056291d552b6674e31d7 | |
| parent | 594296c3e375279fdb2b05afd20e6c66bc1a925b (diff) | |
| download | scummvm-rg350-1e8047a5d221cb9328bfa13efa9460d51d3bfdc4.tar.gz scummvm-rg350-1e8047a5d221cb9328bfa13efa9460d51d3bfdc4.tar.bz2 scummvm-rg350-1e8047a5d221cb9328bfa13efa9460d51d3bfdc4.zip | |
Fix xmap regression, when drawing wiz images.
svn-id: r26119
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index b555dfeb65..d9ece1cb1c 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -553,7 +553,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C int h, w, xoff, dstInc; if (type == kWizXMap) { - assert(palPtr != 0 && xmapPtr != 0); + assert(xmapPtr != 0); } if (type == kWizRMap) { assert(palPtr != 0); @@ -619,7 +619,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C } while (code--) { if (type == kWizXMap) { - *dstPtr = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr]; + *dstPtr = xmapPtr[*dataPtr * 256 + *dstPtr]; } if (type == kWizRMap) { *dstPtr = palPtr[*dataPtr]; @@ -647,7 +647,7 @@ void Wiz::decompressWizImage(uint8 *dst, int dstPitch, const uint8 *src, const C } while (code--) { if (type == kWizXMap) { - *dstPtr = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr]; + *dstPtr = xmapPtr[*dataPtr++ * 256 + *dstPtr]; } if (type == kWizRMap) { *dstPtr = palPtr[*dataPtr++]; |