diff options
| author | Eugene Sandulenko | 2016-05-04 11:34:55 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-04 11:34:55 +0200 |
| commit | 38cd94f448babfde0da1275a2f013b6300f89324 (patch) | |
| tree | 1ea6ffeb048117eaa3cff06c5365145b49d0be14 | |
| parent | 8ff5329b496c4d599f95eb2703716506bff94ffa (diff) | |
| download | scummvm-rg350-38cd94f448babfde0da1275a2f013b6300f89324.tar.gz scummvm-rg350-38cd94f448babfde0da1275a2f013b6300f89324.tar.bz2 scummvm-rg350-38cd94f448babfde0da1275a2f013b6300f89324.zip | |
SCUMM HE: Added Composite Wiz images to pixel detection
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 055df25e49..3f992231a3 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -2795,11 +2795,12 @@ int Wiz::isWizPixelNonTransparent(int resNum, int state, int x, int y, int flags case 2: ret = getRawWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR)) != _vm->VAR(_vm->VAR_WIZ_TCOLOR) ? 1 : 0; break; - case 4: - // TODO: Unknown image type - ret = 1; - debug(0, "isWizPixelNonTransparent: Unhandled wiz compression type %d", c); + case 4: { + uint16 color = 0xffff; + copyCompositeWizImage((byte *)&color, data, wizd, 0, 2, kDstMemory, 1, 1, -x, -y, w, h, state, 0, 0, 0, 0, 2, 0, 0); + ret = color != 0xffff; break; + } case 5: ret = isWizPixelNonTransparent(wizd, x, y, w, h, 2); break; @@ -2839,8 +2840,7 @@ uint16 Wiz::getWizPixelColor(int resNum, int state, int x, int y) { color = getRawWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR)); break; case 4: - // TODO: Unknown image type - debug(0, "getWizPixelColor: Unhandled wiz compression type %d", c); + copyCompositeWizImage((byte *)&color, data, wizd, 0, 2, kDstMemory, 1, 1, -x, -y, w, h, state, 0, 0, 0, 0, 2, 0, 0); break; case 5: color = getWizPixelColor(wizd, x, y, w, h, 2, _vm->VAR(_vm->VAR_WIZ_TCOLOR)); |