aboutsummaryrefslogtreecommitdiff
path: root/sound.cpp
diff options
context:
space:
mode:
authorNicolas Noble2002-05-12 21:39:19 +0000
committerNicolas Noble2002-05-12 21:39:19 +0000
commit16e004832f0197fd10b7093dc4e171a9f2f36e7c (patch)
tree14d5c1615b79bec3f0a2b5af4db35ab957644b31 /sound.cpp
parenta494becc370b8a773708a6bb9a25dba6b4a7ebee (diff)
downloadscummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.tar.gz
scummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.tar.bz2
scummvm-rg350-16e004832f0197fd10b7093dc4e171a9f2f36e7c.zip
Closing bug #555104
svn-id: r4299
Diffstat (limited to 'sound.cpp')
-rw-r--r--sound.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound.cpp b/sound.cpp
index eca38eed3a..48b8505a6d 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -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);