libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-11 05:36:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r52673
This commit is contained in:
Paul Gilbert 2010-09-11 04:32:53 +00:00
parent a002c6f2fd
commit 77c43f4d0d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/tinsel/sound.cpp
View File

@ -34,6 +34,7 @@
#include "tinsel/sysvar.h" #include "tinsel/sysvar.h"
#include "tinsel/background.h" #include "tinsel/background.h"
#include "common/config-manager.h"
#include "common/endian.h" #include "common/endian.h"
#include "common/file.h" #include "common/file.h"
#include "common/system.h" #include "common/system.h"
@ -318,9 +319,13 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
} }
// FIXME: Should set this in a different place ;) // 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::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->sampleNum = id;
curChan->subSample = sub; curChan->subSample = sub;