diff options
| author | Johannes Schickel | 2006-11-06 22:06:32 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-11-06 22:06:32 +0000 |
| commit | 68c603631b1be33965e077b31c16769da4c2195e (patch) | |
| tree | 0764f28c472846db8b22298f0aefb21e8036a24b /engines | |
| parent | 90e20121b80383f23cc8641d463a8609837dab8c (diff) | |
| download | scummvm-rg350-68c603631b1be33965e077b31c16769da4c2195e.tar.gz scummvm-rg350-68c603631b1be33965e077b31c16769da4c2195e.tar.bz2 scummvm-rg350-68c603631b1be33965e077b31c16769da4c2195e.zip | |
cleanup
svn-id: r24642
Diffstat (limited to 'engines')
| -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 35a40c841f..f226e7bc17 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((int)code, (int)(dstEnd - dst)); + const int sz = MIN<int>(code, dstEnd - dst); memset(dst, *data++, sz); dst += sz; } else { // copy code = (code >> 2) + 1; - const int sz = MIN((int)code, (int)(dstEnd - dst)); + const int sz = MIN<int>(code, dstEnd - dst); memcpy(dst, data, sz); dst += sz; data += sz; |