From 0410d6dfaef068a57462cb241f6f3a96fde1cc4b Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 19 Dec 2008 12:03:22 +0000 Subject: 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 --- engines/saga/sound.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/saga/sound.cpp') 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); } -- cgit v1.2.3