diff options
author | Filippos Karapetis | 2007-12-23 02:33:58 +0000 |
---|---|---|
committer | Filippos Karapetis | 2007-12-23 02:33:58 +0000 |
commit | 5b74b676ce35172cae45278a8e6008c0858bf4d4 (patch) | |
tree | 7af869a81bb2538ec02f5f16c5f3350203739759 /engines/saga/interface.cpp | |
parent | 275c91be33968f17bf1ad2cad2cccdece598ce98 (diff) | |
download | scummvm-rg350-5b74b676ce35172cae45278a8e6008c0858bf4d4.tar.gz scummvm-rg350-5b74b676ce35172cae45278a8e6008c0858bf4d4.tar.bz2 scummvm-rg350-5b74b676ce35172cae45278a8e6008c0858bf4d4.zip |
Disable voices when voice files do not exist (like the original interpreter does), instead of exiting with an error. This is necessary for devices with little space
svn-id: r29956
Diffstat (limited to 'engines/saga/interface.cpp')
-rw-r--r-- | engines/saga/interface.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 4eeb62f422..c299bbf0e0 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -1597,15 +1597,20 @@ void Interface::setOption(PanelButton *panelButton) { ConfMan.setInt("sfx_volume", _vm->_soundVolume * 25); break; case kTextVoices: - if (_vm->_subtitlesEnabled && _vm->_voicesEnabled) { // Both - _vm->_subtitlesEnabled = false; // Set it to "Audio" - _vm->_voicesEnabled = true; // Not necessary, just for completeness - } else if (!_vm->_subtitlesEnabled && _vm->_voicesEnabled) { - _vm->_subtitlesEnabled = true; // Set it to "Text" + if (_vm->_voiceFilesExist) { + if (_vm->_subtitlesEnabled && _vm->_voicesEnabled) { // Both + _vm->_subtitlesEnabled = false; // Set it to "Audio" + _vm->_voicesEnabled = true; // Not necessary, just for completeness + } else if (!_vm->_subtitlesEnabled && _vm->_voicesEnabled) { + _vm->_subtitlesEnabled = true; // Set it to "Text" + _vm->_voicesEnabled = false; + } else if (_vm->_subtitlesEnabled && !_vm->_voicesEnabled) { + _vm->_subtitlesEnabled = true; // Set it to "Both" + _vm->_voicesEnabled = true; + } + } else { + _vm->_subtitlesEnabled = true; // Set it to "Text" _vm->_voicesEnabled = false; - } else if (_vm->_subtitlesEnabled && !_vm->_voicesEnabled) { - _vm->_subtitlesEnabled = true; // Set it to "Both" - _vm->_voicesEnabled = true; } ConfMan.setBool("subtitles", _vm->_subtitlesEnabled); |