diff options
author | Max Horn | 2006-04-29 23:09:40 +0000 |
---|---|---|
committer | Max Horn | 2006-04-29 23:09:40 +0000 |
commit | eaca27a33bb5bc68fae8a58b32f2cec94aabb5fb (patch) | |
tree | b944528d021c6a02cdbf486c30eddfd02e1337e3 /engines/scumm/dialogs.cpp | |
parent | 27307acd7c6f9f9083bdcad38ba54f18d4f080b7 (diff) | |
download | scummvm-rg350-eaca27a33bb5bc68fae8a58b32f2cec94aabb5fb.tar.gz scummvm-rg350-eaca27a33bb5bc68fae8a58b32f2cec94aabb5fb.tar.bz2 scummvm-rg350-eaca27a33bb5bc68fae8a58b32f2cec94aabb5fb.zip |
Renamed updateVolumes to updateSoundSettings -- now it also handles subtitles/speech_mute settings. Also changed the ConfigDialog accordingly
svn-id: r22233
Diffstat (limited to 'engines/scumm/dialogs.cpp')
-rw-r--r-- | engines/scumm/dialogs.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index cab98503f6..c44c8cfa2d 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -733,18 +733,7 @@ void ConfigDialog::close() { if (getResult()) { // Subtitles ConfMan.setBool("subtitles", _subtitlesCheckbox->getState(), _domain); - - // Sync with current setting - if (!_speechCheckbox->getState()) { - ConfMan.setBool("speech_mute", true, _domain); - _vm->_voiceMode = 2; - } else { - ConfMan.setBool("speech_mute", false, _domain); - _vm->_voiceMode = _subtitlesCheckbox->getState(); - } - - if (_vm->_game.version >= 7) - _vm->VAR(_vm->VAR_VOICE_MODE) = _vm->_voiceMode; + ConfMan.setBool("speech_mute", !_speechCheckbox->getState(), _domain); } GUI_OptionsDialog::close(); |