diff options
| author | dhewg | 2011-03-19 15:09:21 +0100 |
|---|---|---|
| committer | dhewg | 2011-03-19 16:49:15 +0100 |
| commit | 02956eaf0b220fb7395ee82971c26cb3e4502d8d (patch) | |
| tree | d7efda87bbc6ea892672d629d11502494c41d907 /engines | |
| parent | 5e8907fc3cff41cd27e04bbbe5d434f2017fca88 (diff) | |
| download | scummvm-rg350-02956eaf0b220fb7395ee82971c26cb3e4502d8d.tar.gz scummvm-rg350-02956eaf0b220fb7395ee82971c26cb3e4502d8d.tar.bz2 scummvm-rg350-02956eaf0b220fb7395ee82971c26cb3e4502d8d.zip | |
SWORD1: Cleanup syncSoundSettings()
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword1/sword1.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 537720401d..8768e62457 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -170,6 +170,8 @@ void SwordEngine::reinitialize() { } void SwordEngine::syncSoundSettings() { + Engine::syncSoundSettings(); + uint musicVol = ConfMan.getInt("music_volume"); uint sfxVol = ConfMan.getInt("sfx_volume"); uint speechVol = ConfMan.getInt("speech_volume"); @@ -228,9 +230,6 @@ void SwordEngine::syncSoundSettings() { _sound->setSpeechVol(speechVolL, speechVolR); _sound->setSfxVol(sfxVolL, sfxVolR); } - - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, mute ? 0 : ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, mute ? 0 : ConfMan.getInt("speech_volume")); } void SwordEngine::flagsToBool(bool *dest, uint8 flags) { |