diff options
author | Eugene Sandulenko | 2004-11-29 00:17:03 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2004-11-29 00:17:03 +0000 |
commit | 99503e3a32ecd8e5631f54840f91a66a08b6717a (patch) | |
tree | 6dbf711a128bd910a3103d0e8f3034faebadfaeb | |
parent | 72cb985ee3b63fcc75048ab8a31b69a1ecfbd4c7 (diff) | |
download | scummvm-rg350-99503e3a32ecd8e5631f54840f91a66a08b6717a.tar.gz scummvm-rg350-99503e3a32ecd8e5631f54840f91a66a08b6717a.tar.bz2 scummvm-rg350-99503e3a32ecd8e5631f54840f91a66a08b6717a.zip |
Fix music volume
svn-id: r15959
-rw-r--r-- | saga/saga.cpp | 3 | ||||
-rw-r--r-- | sky/sky.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp index f802a045b4..30a1f30e8c 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -112,7 +112,8 @@ SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst) warning("Sound initialization failed."); } - _mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255); + _mixer->setVolume(ConfMan.getInt("sfx_volume")); + _mixer->setMusicVolume(ConfMan.getInt("music_volume")); _vm = this; } diff --git a/sky/sky.cpp b/sky/sky.cpp index 2c19622f7f..e45c3c53d8 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -255,6 +255,7 @@ int SkyEngine::init(GameDetector &detector) { warning("Sound initialisation failed"); _mixer->setVolume(ConfMan.getInt("sfx_volume")); + _mixer->setMusicVolume(ConfMan.getInt("music_volume")); _floppyIntro = ConfMan.getBool("alt_intro"); _skyDisk = new Disk(_gameDataPath); |