diff options
| author | Johannes Schickel | 2009-06-21 19:00:50 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-21 19:00:50 +0000 |
| commit | 76eee406d63b7f614bd3f6e8e5e3f70aff97c921 (patch) | |
| tree | 62e0d722da395b1bfb048f454f830286da4fb369 /engines/kyra/lol.cpp | |
| parent | 5b0b0051c15ff23ed8daf801d4b56cbaadf2f101 (diff) | |
| download | scummvm-rg350-76eee406d63b7f614bd3f6e8e5e3f70aff97c921.tar.gz scummvm-rg350-76eee406d63b7f614bd3f6e8e5e3f70aff97c921.tar.bz2 scummvm-rg350-76eee406d63b7f614bd3f6e8e5e3f70aff97c921.zip | |
Cleanup: Change LoL code to use KYRA volume handling.
svn-id: r41730
Diffstat (limited to 'engines/kyra/lol.cpp')
| -rw-r--r-- | engines/kyra/lol.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index fb4f989195..d87d6eaa1b 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -918,10 +918,6 @@ void LoLEngine::writeSettings() { ConfMan.set("language", Common::getLanguageCode(_flags.lang)); KyraEngine_v1::writeSettings(); - - setVolume(kVolumeMusic, _musicVolume); - setVolume(kVolumeSfx, _sfxVolume); - setVolume(kVolumeSpeech, _speechVolume); } void LoLEngine::readSettings() { @@ -930,12 +926,6 @@ void LoLEngine::readSettings() { _floatingCursorsEnabled = ConfMan.getBool("floating cursors"); KyraEngine_v1::readSettings(); - - _musicVolume = getVolume(kVolumeMusic); - _sfxVolume = getVolume(kVolumeSfx); - _speechVolume = getVolume(kVolumeSpeech); - if (_speechVolume == 2) - _speechVolume = 0; } void LoLEngine::update() { @@ -1149,7 +1139,7 @@ void LoLEngine::updatePortraitSpeechAnim() { f -= 5; f += 7; - if (_speechVolume) { + if (speechEnabled()) { if (snd_updateCharacterSpeech() == 2) _updatePortraitSpeechAnimDuration = 2; else |