[Scummvm-cvs-logs] scummvm master -> 17832f2ab1abe0f6a8f6563879099242b816cd59

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
17832f2ab1 SCUMM HE: Fix picky Amiga port. Again


Commit: 17832f2ab1abe0f6a8f6563879099242b816cd59
    https://github.com/scummvm/scummvm/commit/17832f2ab1abe0f6a8f6563879099242b816cd59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-12T13:08:08+02:00

Commit Message:
SCUMM HE: Fix picky Amiga port. Again

Changed paths:
    engines/scumm/he/moonbase/moonbase.cpp



diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index add7ba8..9dc58af 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;