aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2006-04-16 19:23:14 +0000
committerMax Horn2006-04-16 19:23:14 +0000
commit74edd90aba15db1196b16b5eae918347670d11c8 (patch)
tree7410c4e14dadff2c051b42ea3a09d99987b0d6d5 /gui
parent08b9cd7922c48df064c17d71cc306f330043b817 (diff)
downloadscummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.tar.gz
scummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.tar.bz2
scummvm-rg350-74edd90aba15db1196b16b5eae918347670d11c8.zip
Fix for bug #1471383: Instead of overloading ConfigManager::set, we now have new setInt and setBool methods (matching getInt/getBool), which avoids strange quirks & bugs caused by (char *) being implicitly cast to int (ouch)
svn-id: r21951
Diffstat (limited to 'gui')
-rw-r--r--gui/options.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/gui/options.cpp b/gui/options.cpp
index 97eb586b33..7d1025d0d0 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -208,8 +208,8 @@ void OptionsDialog::close() {
if (getResult()) {
if (_fullscreenCheckbox) {
if (_enableGraphicSettings) {
- ConfMan.set("fullscreen", _fullscreenCheckbox->getState(), _domain);
- ConfMan.set("aspect_ratio", _aspectCheckbox->getState(), _domain);
+ ConfMan.setBool("fullscreen", _fullscreenCheckbox->getState(), _domain);
+ ConfMan.setBool("aspect_ratio", _aspectCheckbox->getState(), _domain);
if ((int32)_gfxPopUp->getSelectedTag() >= 0)
ConfMan.set("gfx_mode", _gfxPopUp->getSelectedString(), _domain);
@@ -226,9 +226,9 @@ void OptionsDialog::close() {
if (_musicVolumeSlider) {
if (_enableVolumeSettings) {
- ConfMan.set("music_volume", _musicVolumeSlider->getValue(), _domain);
- ConfMan.set("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
- ConfMan.set("speech_volume", _speechVolumeSlider->getValue(), _domain);
+ ConfMan.setInt("music_volume", _musicVolumeSlider->getValue(), _domain);
+ ConfMan.setInt("sfx_volume", _sfxVolumeSlider->getValue(), _domain);
+ ConfMan.setInt("speech_volume", _speechVolumeSlider->getValue(), _domain);
} else {
ConfMan.removeKey("music_volume", _domain);
ConfMan.removeKey("sfx_volume", _domain);
@@ -238,7 +238,7 @@ void OptionsDialog::close() {
if (_subCheckbox) {
if (_enableAudioSettings) {
- ConfMan.set("subtitles", _subCheckbox->getState(), _domain);
+ ConfMan.setBool("subtitles", _subCheckbox->getState(), _domain);
const MidiDriverDescription *md = MidiDriver::getAvailableMidiDrivers();
while (md->name && md->id != (int)_midiPopUp->getSelectedTag())
md++;
@@ -255,9 +255,9 @@ void OptionsDialog::close() {
// MIDI options
if (_multiMidiCheckbox) {
if (_enableMIDISettings) {
- ConfMan.set("multi_midi", _multiMidiCheckbox->getState(), _domain);
- ConfMan.set("native_mt32", _mt32Checkbox->getState(), _domain);
- ConfMan.set("enable_gs", _enableGSCheckbox->getState(), _domain);
+ ConfMan.setBool("multi_midi", _multiMidiCheckbox->getState(), _domain);
+ ConfMan.setBool("native_mt32", _mt32Checkbox->getState(), _domain);
+ ConfMan.setBool("enable_gs", _enableGSCheckbox->getState(), _domain);
String soundFont = _soundFont->getLabel();
if (!soundFont.empty() && (soundFont != "None"))