diff options
| author | Colin Snover | 2016-08-26 20:06:00 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
| commit | 3cf16c0a7f9731a88914531392628b2dc599d787 (patch) | |
| tree | 1aa980305f0ca7d0c817dc34ffe9216428bb9093 /engines/sci/sound | |
| parent | d0517f515eb7f36ec7222f3d50f4917fbd7df5e7 (diff) | |
| download | scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.tar.gz scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.tar.bz2 scummvm-rg350-3cf16c0a7f9731a88914531392628b2dc599d787.zip | |
SCI32: Explicitly instantiate MIN/MAX templates
Diffstat (limited to 'engines/sci/sound')
| -rw-r--r-- | engines/sci/sound/audio32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp index 43c21939fa..659a5265d4 100644 --- a/engines/sci/sound/audio32.cpp +++ b/engines/sci/sound/audio32.cpp @@ -1027,7 +1027,7 @@ int16 Audio32::getVolume(const int16 channelIndex) const { } void Audio32::setVolume(const int16 channelIndex, int16 volume) { - volume = MIN((int16)kMaxVolume, volume); + volume = MIN<int16>(kMaxVolume, volume); if (channelIndex == kAllChannels) { ConfMan.setInt("sfx_volume", volume * Audio::Mixer::kMaxChannelVolume / kMaxVolume); ConfMan.setInt("speech_volume", volume * Audio::Mixer::kMaxChannelVolume / kMaxVolume); |