diff options
author | athrxx | 2011-03-22 15:55:17 +0100 |
---|---|---|
committer | athrxx | 2011-03-22 15:55:17 +0100 |
commit | ea79336ac90e12fe53242cfd9153db9d7087ca0f (patch) | |
tree | 50c74ceb394cf23d845c408659459f3b07192b92 /engines/scumm | |
parent | 92f922aabe5811fcf595697bc1316aa57b4c9b66 (diff) | |
parent | 273ba73d5fae0dd0d3b3f7c5f15f03d02c0af1b4 (diff) | |
download | scummvm-rg350-ea79336ac90e12fe53242cfd9153db9d7087ca0f.tar.gz scummvm-rg350-ea79336ac90e12fe53242cfd9153db9d7087ca0f.tar.bz2 scummvm-rg350-ea79336ac90e12fe53242cfd9153db9d7087ca0f.zip |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/scumm.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c2556d6467..564f3a7e9c 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1874,11 +1874,11 @@ void ScummEngine::setupMusic(int midi) { } void ScummEngine::syncSoundSettings() { + Engine::syncSoundSettings(); // Sync the engine with the config manager int soundVolumeMusic = ConfMan.getInt("music_volume"); int soundVolumeSfx = ConfMan.getInt("sfx_volume"); - int soundVolumeSpeech = ConfMan.getInt("speech_volume"); bool mute = false; @@ -1886,7 +1886,7 @@ void ScummEngine::syncSoundSettings() { mute = ConfMan.getBool("mute"); if (mute) - soundVolumeMusic = soundVolumeSfx = soundVolumeSpeech = 0; + soundVolumeMusic = soundVolumeSfx = 0; } if (_musicEngine) { @@ -1897,10 +1897,6 @@ void ScummEngine::syncSoundSettings() { _townsPlayer->setSfxVolume(soundVolumeSfx); } - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSfx); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); - if (ConfMan.getBool("speech_mute")) _voiceMode = 2; else |