diff options
| author | Eugene Sandulenko | 2006-11-06 18:21:07 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-11-06 18:21:07 +0000 |
| commit | 90e20121b80383f23cc8641d463a8609837dab8c (patch) | |
| tree | 21e9907e99c5d1deb39e3c47132c50ff7c049d31 /engines/scumm | |
| parent | 1b926fee107cef0e1bc525a7a082121f1d000881 (diff) | |
| download | scummvm-rg350-90e20121b80383f23cc8641d463a8609837dab8c.tar.gz scummvm-rg350-90e20121b80383f23cc8641d463a8609837dab8c.tar.bz2 scummvm-rg350-90e20121b80383f23cc8641d463a8609837dab8c.zip | |
Portability fix for some platforms.
svn-id: r24641
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |