diff options
author | Nicolas Noble | 2002-05-12 21:39:19 +0000 |
---|---|---|
committer | Nicolas Noble | 2002-05-12 21:39:19 +0000 |
commit | 16e004832f0197fd10b7093dc4e171a9f2f36e7c (patch) | |
tree | 14d5c1615b79bec3f0a2b5af4db35ab957644b31 | |
parent | a494becc370b8a773708a6bb9a25dba6b4a7ebee (diff) | |
download | scummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.tar.gz scummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.tar.bz2 scummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.zip |
Closing bug #555104
svn-id: r4299
-rw-r--r-- | gui.cpp | 6 | ||||
-rw-r--r-- | sound.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
@@ -594,9 +594,9 @@ void Gui::handleSoundDialogCommand(int cmd) imuse->set_music_volume(_s->_sound_volume_music); imuse->set_master_volume(_s->_sound_volume_master); _s->_mixer->set_volume(_s->_sound_volume_sfx); - scummcfg->set("master_volume", _s->_sound_volume_master, "scummvm"); - scummcfg->set("music_volume", _s->_sound_volume_music, "scummvm"); - scummcfg->set("sfx_volume", _s->_sound_volume_sfx, "scummvm"); + scummcfg->set("master_volume", _s->_sound_volume_master); + scummcfg->set("music_volume", _s->_sound_volume_music); + scummcfg->set("sfx_volume", _s->_sound_volume_sfx); scummcfg->flush(); } @@ -408,18 +408,18 @@ void Scumm::setupSound() IMuse *se = _imuse; if (se) { se->setBase(res.address[rtSound]); - if (!scummcfg->get("music_volume", "scummvm")) + if (!scummcfg->get("music_volume")) _sound_volume_music = 60; else - _sound_volume_music = atoi(scummcfg->get("music_volume", "scummvm")); - if (!scummcfg->get("master_volume", "scummvm")) + _sound_volume_music = atoi(scummcfg->get("music_volume")); + if (!scummcfg->get("master_volume")) _sound_volume_master = 125; else - _sound_volume_master = atoi(scummcfg->get("master_volume", "scummvm")); - if (!scummcfg->get("sfx_volume", "scummvm")) + _sound_volume_master = atoi(scummcfg->get("master_volume")); + if (!scummcfg->get("sfx_volume")) _sound_volume_sfx = 100; else - _sound_volume_sfx = atoi(scummcfg->get("sfx_volume", "scummvm")); + _sound_volume_sfx = atoi(scummcfg->get("sfx_volume")); se->set_master_volume(_sound_volume_master); se->set_music_volume(_sound_volume_music); |