diff options
author | Johannes Schickel | 2012-12-14 21:18:56 +0100 |
---|---|---|
committer | Johannes Schickel | 2012-12-14 21:18:56 +0100 |
commit | 9a0e2b7ee7dc19af4894495234af5569031fd096 (patch) | |
tree | 29c175797380c74c78d4a2a309ea1592132199dc /engines | |
parent | 1782f85beec66cebcdfbb5e1132155c49400c48f (diff) | |
download | scummvm-rg350-9a0e2b7ee7dc19af4894495234af5569031fd096.tar.gz scummvm-rg350-9a0e2b7ee7dc19af4894495234af5569031fd096.tar.bz2 scummvm-rg350-9a0e2b7ee7dc19af4894495234af5569031fd096.zip |
SCUMM: Fix compilation on AmigaOS4.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/player_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/player_mac.cpp b/engines/scumm/player_mac.cpp index bbb97d360a..c16c85bff3 100644 --- a/engines/scumm/player_mac.cpp +++ b/engines/scumm/player_mac.cpp @@ -346,7 +346,7 @@ int Player_Mac::readBuffer(int16 *data, const int numSamples) { _channel[i]._remaining = samplesLeft; } } - generated = MIN(_channel[i]._remaining, samplesLeft); + generated = MIN<uint32>(_channel[i]._remaining, samplesLeft); if (_channel[i]._velocity != 0) { _channel[i]._instrument.generateSamples(ptr, _channel[i]._pitchModifier, _channel[i]._velocity, generated, _channel[i]._remaining, _fadeNoteEnds); } |