diff options
| author | Martin Kiewitz | 2010-01-02 08:30:19 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-02 08:30:19 +0000 |
| commit | df94844db0c80e4acb6e44f90478355ad2c6f8d6 (patch) | |
| tree | f442c5c3dd96d78e332bfe7f920b157a955f5fcb | |
| parent | 513a56cd5e6aaa06f1b88d94c4284a808c99c992 (diff) | |
| download | scummvm-rg350-df94844db0c80e4acb6e44f90478355ad2c6f8d6.tar.gz scummvm-rg350-df94844db0c80e4acb6e44f90478355ad2c6f8d6.tar.bz2 scummvm-rg350-df94844db0c80e4acb6e44f90478355ad2c6f8d6.zip | |
SCI/newmusic: now clipping volume in cmdFadeSound
svn-id: r46876
| -rw-r--r-- | engines/sci/sfx/soundcmd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp index 467aa6f8bf..beddedef8c 100644 --- a/engines/sci/sfx/soundcmd.cpp +++ b/engines/sci/sfx/soundcmd.cpp @@ -639,7 +639,7 @@ void SoundCommandParser::cmdFadeSound(reg_t obj, int16 value) { } int volume = musicSlot->volume; - musicSlot->fadeTo = _argv[2].toUint16(); + musicSlot->fadeTo = CLIP<uint16>(_argv[2].toUint16(), 0, MUSIC_VOLUME_MAX); musicSlot->fadeStep = volume > _argv[2].toUint16() ? -_argv[4].toUint16() : _argv[4].toUint16(); musicSlot->fadeTickerStep = _argv[3].toUint16() * 16667 / _music->soundGetTempo(); musicSlot->fadeTicker = 0; |