diff options
| author | Filippos Karapetis | 2008-12-19 12:03:22 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-19 12:03:22 +0000 |
| commit | 0410d6dfaef068a57462cb241f6f3a96fde1cc4b (patch) | |
| tree | 3b3aa78e195771a044432ae669bcdeb38d8e5613 /engines/saga/sound.cpp | |
| parent | 2911aa04c18654e32e985217f371eba74dfedd82 (diff) | |
| download | scummvm-rg350-0410d6dfaef068a57462cb241f6f3a96fde1cc4b.tar.gz scummvm-rg350-0410d6dfaef068a57462cb241f6f3a96fde1cc4b.tar.bz2 scummvm-rg350-0410d6dfaef068a57462cb241f6f3a96fde1cc4b.zip | |
Removed the hasKey() hackery of my previous commit and used ConfMan.registerDefault() instead. Changed sound_volume back to sfx_volume, which got changed with the GSoC merge and was the actual cause that the sound effects were off by default
svn-id: r35437
Diffstat (limited to 'engines/saga/sound.cpp')
| -rw-r--r-- | engines/saga/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index f87f30a3fa..e693e16629 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -206,8 +206,8 @@ void Sound::stopAll() { } void Sound::setVolume() { - _vm->_soundVolume = ConfMan.hasKey("sound_volume") ? ConfMan.getInt("sound_volume") : 255; - _vm->_speechVolume = ConfMan.hasKey("speech_volume") ? ConfMan.getInt("speech_volume") : 255; + _vm->_soundVolume = ConfMan.getInt("sfx_volume"); + _vm->_speechVolume = ConfMan.getInt("speech_volume"); _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, _vm->_soundVolume); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_speechVolume); } |