diff options
| author | Eugene Sandulenko | 2016-05-13 00:27:37 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-13 00:27:37 +0200 |
| commit | 1585727ee0376c4a03c2e1e4b34569749af11b10 (patch) | |
| tree | 694f59be07abcb97d101faed9a97eb885ef9ff04 /engines/scumm | |
| parent | 8d08912d223ffb3112107b58b7ff51e0aba56448 (diff) | |
| download | scummvm-rg350-1585727ee0376c4a03c2e1e4b34569749af11b10.tar.gz scummvm-rg350-1585727ee0376c4a03c2e1e4b34569749af11b10.tar.bz2 scummvm-rg350-1585727ee0376c4a03c2e1e4b34569749af11b10.zip | |
SCUMM HE: Fix T14 special mode blending.
This fixe energy shield color.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/moonbase/moonbase.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp index c07bd986d8..34d4368725 100644 --- a/engines/scumm/he/moonbase/moonbase.cpp +++ b/engines/scumm/he/moonbase/moonbase.cpp @@ -155,8 +155,7 @@ void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, con } else { uint32 pix = ((orig << 16) | orig) & 0x3e07c1f; pix = (((pix * alpha) & 0xffffffff) >> 5) & 0x3e07c1f; - pix = ((pix << 16) + pix + color) & 0xffff; - + pix = ((pix >> 16) + pix + color) & 0xffff; WRITE_LE_UINT16(dst1, pix); } } diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 2a9f7ec102..43994c33d6 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -1800,7 +1800,7 @@ void Wiz::copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType, break; case 5: - warning("T14: MMX_CHEAP_50_50"); + //warning("T14: MMX_CHEAP_50_50"); break; case 6: |