diff options
| author | Marcus Comstedt | 2005-04-11 20:34:21 +0000 |
|---|---|---|
| committer | Marcus Comstedt | 2005-04-11 20:34:21 +0000 |
| commit | b9da94d8f166d634a34183a7d9f645dc91d779c6 (patch) | |
| tree | 9e168147471dcb13b3302ab6fadbe1fa6de70855 /scumm | |
| parent | fa80c6e8bafd311ba3e44a6d6a018a72049f3c3a (diff) | |
| download | scummvm-rg350-b9da94d8f166d634a34183a7d9f645dc91d779c6.tar.gz scummvm-rg350-b9da94d8f166d634a34183a7d9f645dc91d779c6.tar.bz2 scummvm-rg350-b9da94d8f166d634a34183a7d9f645dc91d779c6.zip | |
MIN() on two different datatypes not allowed...
svn-id: r17551
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sprite_he.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index 589cc765c4..45ee0d123e 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -757,7 +757,7 @@ void ScummEngine_v90he::spriteInfoSet_field_8C_90(int spriteId, int type, int va break; case 0x7E: delay = MAX(0, value); - delay = MIN(value, _spriteTable[spriteId].delayAmount); + delay = MIN((int32)value, _spriteTable[spriteId].delayAmount); _spriteTable[spriteId].delayCount = value; break; |