diff options
| author | Eugene Sandulenko | 2016-05-12 13:08:08 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-05-12 13:08:08 +0200 |
| commit | 17832f2ab1abe0f6a8f6563879099242b816cd59 (patch) | |
| tree | 3a0db336ae17fa75b1e214849d24c327cfd4cdc9 /engines/scumm | |
| parent | a5f83f805855b772c36eabf70d00ad5fb45c7d01 (diff) | |
| download | scummvm-rg350-17832f2ab1abe0f6a8f6563879099242b816cd59.tar.gz scummvm-rg350-17832f2ab1abe0f6a8f6563879099242b816cd59.tar.bz2 scummvm-rg350-17832f2ab1abe0f6a8f6563879099242b816cd59.zip | |
SCUMM HE: Fix picky Amiga port. Again
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/moonbase/moonbase.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp index add7ba83c1..9dc58aff1e 100644 --- a/engines/scumm/he/moonbase/moonbase.cpp +++ b/engines/scumm/he/moonbase/moonbase.cpp @@ -97,9 +97,9 @@ void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, con uint16 color = READ_LE_UINT16(quadsOffset); uint32 orig = READ_LE_UINT16(dst1); - uint32 r = MIN(0x7c00u, (orig & 0x7c00) + (color & 0x7c00)); - uint32 g = MIN(0x03e0u, (orig & 0x03e0) + (color & 0x03e0)); - uint32 b = MIN(0x001fu, (orig & 0x001f) + (color & 0x001f)); + uint32 r = MIN<uint32>(0x7c00, (orig & 0x7c00) + (color & 0x7c00)); + uint32 g = MIN<uint32>(0x03e0, (orig & 0x03e0) + (color & 0x03e0)); + uint32 b = MIN<uint32>(0x001f, (orig & 0x001f) + (color & 0x001f)); WRITE_LE_UINT16(dst1, (r | g | b)); } dst1 += 2; @@ -115,9 +115,9 @@ void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, con uint16 color = READ_LE_UINT16(singlesOffset); uint32 orig = READ_LE_UINT16(dst1); - uint32 r = MIN(0x7c00u, (orig & 0x7c00) + (color & 0x7c00)); - uint32 g = MIN(0x03e0u, (orig & 0x03e0) + (color & 0x03e0)); - uint32 b = MIN(0x001fu, (orig & 0x001f) + (color & 0x001f)); + uint32 r = MIN<uint32>(0x7c00u, (orig & 0x7c00) + (color & 0x7c00)); + uint32 g = MIN<uint32>(0x03e0u, (orig & 0x03e0) + (color & 0x03e0)); + uint32 b = MIN<uint32>(0x001fu, (orig & 0x001f) + (color & 0x001f)); WRITE_LE_UINT16(dst1, (r | g | b)); } dst1 += 2; |