From df94844db0c80e4acb6e44f90478355ad2c6f8d6 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 2 Jan 2010 08:30:19 +0000
Subject: SCI/newmusic: now clipping volume in cmdFadeSound

svn-id: r46876
---
 engines/sci/sfx/soundcmd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3