diff options
| author | Travis Howell | 2005-04-17 09:45:38 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-17 09:45:38 +0000 |
| commit | 9daddf595570e536e622f1b85274e40401da66c2 (patch) | |
| tree | fe60540c6415c291b2a413b97980579f00d2049c | |
| parent | 6feb1a75f69438df2d2ccd8909f34c53b09a342a (diff) | |
| download | scummvm-rg350-9daddf595570e536e622f1b85274e40401da66c2.tar.gz scummvm-rg350-9daddf595570e536e622f1b85274e40401da66c2.tar.bz2 scummvm-rg350-9daddf595570e536e622f1b85274e40401da66c2.zip | |
wizImage compression type 2 uses different decode method, so disable for now.
svn-id: r17645
| -rw-r--r-- | scumm/wiz_he.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 77f0f293df..e47ff19adc 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -1011,7 +1011,15 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in palPtr = rmap + 4; } - if (comp == 1) { + switch (comp) { + case 0: + { + uint8 *trns = findWrappedBlock(MKID('TRNS'), dataPtr, state, 0); + int color = (trns == NULL) ? VAR(VAR_WIZ_TCOLOR) : -1; + _wiz.copyRawWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, flags, palPtr, color); + } + break; + case 1: // TODO Adding masking for flags 0x80 and 0x100 if (flags & 0x80) { warning("drawWizImage: Unhandled flag 0x80"); @@ -1020,11 +1028,11 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in error("drawWizImage: Unhandled flag 0x100"); } _wiz.copyWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, palPtr); - } else if (comp == 0 || comp == 2 || comp == 3) { - uint8 *trns = findWrappedBlock(MKID('TRNS'), dataPtr, state, 0); - int color = (trns == NULL) ? VAR(VAR_WIZ_TCOLOR) : -1; - _wiz.copyRawWizImage(dst, wizd, cw, ch, x1, y1, width, height, &rScreen, flags, palPtr, color); - } else { + break; + case 2: + warning("drawWizImage: Unhandled wiz compression type %d", comp); + break; + default: error("drawWizImage: Unhandled wiz compression type %d", comp); } |