[Scummvm-cvs-logs] SF.net SVN: scummvm:[52673] scummvm/trunk/engines/tinsel/sound.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sat Sep 11 06:32:53 CEST 2010


Revision: 52673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52673&view=rev
Author:   dreammaster
Date:     2010-09-11 04:32:53 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
TINSEL: Fix for #3032778 - Mute not respected in DW2

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/sound.cpp

Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp	2010-09-10 23:40:08 UTC (rev 52672)
+++ scummvm/trunk/engines/tinsel/sound.cpp	2010-09-11 04:32:53 UTC (rev 52673)
@@ -34,6 +34,7 @@
 #include "tinsel/sysvar.h"
 #include "tinsel/background.h"
 
+#include "common/config-manager.h"
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/system.h"
@@ -318,9 +319,13 @@
 	}
 
 	// FIXME: Should set this in a different place ;)
-	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_config->_soundVolume);
+	bool mute = false;
+	if (ConfMan.hasKey("mute"))
+		mute = ConfMan.getBool("mute");
+
+	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : _vm->_config->_soundVolume);
 	//_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
-	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume);
+	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : _vm->_config->_voiceVolume);
 
 	curChan->sampleNum = id;
 	curChan->subSample = sub;


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