[Scummvm-cvs-logs] SF.net SVN: scummvm:[46876] scummvm/trunk/engines/sci/sfx/soundcmd.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46876
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46876&view=rev
Author:   m_kiewitz
Date:     2010-01-02 08:30:19 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
SCI/newmusic: now clipping volume in cmdFadeSound

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 08:15:01 UTC (rev 46875)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 08:30:19 UTC (rev 46876)
@@ -639,7 +639,7 @@
 	}
 
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.