[Scummvm-cvs-logs] SF.net SVN: scummvm:[33267] scummvm/branches/branch-0-12-0/engines/kyra/ sound.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Fri Jul 25 00:14:34 CEST 2008


Revision: 33267
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33267&view=rev
Author:   eriktorbjorn
Date:     2008-07-24 22:14:34 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
(Backport) Make sure _musicVolume and _sfxVolume are clipped to fit in a byte.

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/kyra/sound.cpp

Modified: scummvm/branches/branch-0-12-0/engines/kyra/sound.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/sound.cpp	2008-07-24 22:12:48 UTC (rev 33266)
+++ scummvm/branches/branch-0-12-0/engines/kyra/sound.cpp	2008-07-24 22:14:34 UTC (rev 33267)
@@ -202,8 +202,8 @@
 }
 
 void SoundMidiPC::updateVolumeSettings() {
-	_musicVolume = ConfMan.getInt("music_volume");
-	_sfxVolume = ConfMan.getInt("sfx_volume");
+	_musicVolume = CLIP(ConfMan.getInt("music_volume"), 0, 255);
+	_sfxVolume = CLIP(ConfMan.getInt("sfx_volume"), 0, 255);
 
 	updateChannelVolume(_musicVolume);
 }


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




More information about the Scummvm-git-logs mailing list