aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-04 18:09:19 +0000
committerJohannes Schickel2008-04-04 18:09:19 +0000
commit82c2f1203e1a286a55e1a4155878b234881f8cf0 (patch)
treecb824091aea8f909cee3dd617cc7086da4aaceeb /engines/kyra/kyra.cpp
parent272fa6d578fcb9bcc7ba8511f886630503799bae (diff)
downloadscummvm-rg350-82c2f1203e1a286a55e1a4155878b234881f8cf0.tar.gz
scummvm-rg350-82c2f1203e1a286a55e1a4155878b234881f8cf0.tar.bz2
scummvm-rg350-82c2f1203e1a286a55e1a4155878b234881f8cf0.zip
Cleaned up volume settings managment.
svn-id: r31385
Diffstat (limited to 'engines/kyra/kyra.cpp')
-rw-r--r--engines/kyra/kyra.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index 302f7277ae..74159dbc00 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -129,6 +129,8 @@ int KyraEngine::init() {
}
}
+ if (_sound)
+ _sound->updateVolumeSettings();
_res = new Resource(this);
assert(_res);
_res->reset();
@@ -350,6 +352,8 @@ void KyraEngine::setVolume(kVolumeEntry vol, uint8 value) {
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+ if (_sound)
+ _sound->updateVolumeSettings();
}
uint8 KyraEngine::getVolume(kVolumeEntry vol) {