From 90e20121b80383f23cc8641d463a8609837dab8c Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 6 Nov 2006 18:21:07 +0000 Subject: Portability fix for some platforms. svn-id: r24641 --- engines/scumm/he/cup_player_he.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 72e9f3c8df..35a40c841f 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -222,12 +222,12 @@ void CUP_Player::decodeFRAM(uint8 *dst, Common::Rect *r1, const uint8 *data, int dst += code; } else if (code & 2) { // set code = (code >> 2) + 1; - const int sz = MIN(code, dstEnd - dst); + const int sz = MIN((int)code, (int)(dstEnd - dst)); memset(dst, *data++, sz); dst += sz; } else { // copy code = (code >> 2) + 1; - const int sz = MIN(code, dstEnd - dst); + const int sz = MIN((int)code, (int)(dstEnd - dst)); memcpy(dst, data, sz); dst += sz; data += sz; -- cgit v1.2.3