diff options
| author | Sven Hesse | 2009-08-27 16:29:56 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-08-27 16:29:56 +0000 |
| commit | a6c7d14ddf98baa958871b78a816508d86ae6719 (patch) | |
| tree | 7ff425a680be0dc31e978929e4ca46b8cd18b9f5 | |
| parent | 3963a689379ed61ce1e3f53e224005dcb35e65c3 (diff) | |
| download | scummvm-rg350-a6c7d14ddf98baa958871b78a816508d86ae6719.tar.gz scummvm-rg350-a6c7d14ddf98baa958871b78a816508d86ae6719.tar.bz2 scummvm-rg350-a6c7d14ddf98baa958871b78a816508d86ae6719.zip | |
This just fix the compile errors on AmigaOS (bug #2845660)
svn-id: r43772
| -rw-r--r-- | sound/mods/maxtrax.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp index 90ac3d55ca..517d185fb1 100644 --- a/sound/mods/maxtrax.cpp +++ b/sound/mods/maxtrax.cpp @@ -176,7 +176,7 @@ void MaxTrax::interrupt() { if (cmd < 0x80) { // Note const int8 voiceIndex = noteOn(channel, cmd, (curEvent->parameter & 0xF0) >> 1, kPriorityScore); if (voiceIndex >= 0) - _voiceCtx[voiceIndex].stopEventTime = MAX(0, (eventDelta + curEvent->stopTime) << 8); + _voiceCtx[voiceIndex].stopEventTime = MAX<int32>(0, (eventDelta + curEvent->stopTime) << 8); } else { switch (cmd) { @@ -336,7 +336,7 @@ endOfEventLoop: const uint16 envUnit = _playerCtx.frameUnit; if (voice.envelope) { if (voice.ticksLeft > envUnit) { // envelope still active - voice.baseVolume = (uint16)MIN(MAX(0, voice.baseVolume + voice.incrVolume), 0x8000); + voice.baseVolume = (uint16) MIN<int32>(MAX<int32>(0, voice.baseVolume + voice.incrVolume), 0x8000); voice.ticksLeft -= envUnit; // Update Volume and Period |