diff options
| author | Eugene Sandulenko | 2004-11-29 00:25:15 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-11-29 00:25:15 +0000 |
| commit | 8f863b5d8ffeeefd75d9937eeafcc77db5923ba3 (patch) | |
| tree | 457a5386876f5321b67d4f3949087ae6b95318ee | |
| parent | 99503e3a32ecd8e5631f54840f91a66a08b6717a (diff) | |
| download | scummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.tar.gz scummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.tar.bz2 scummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.zip | |
Fix music volume
svn-id: r15960
| -rw-r--r-- | kyra/kyra.cpp | 3 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 1 | ||||
| -rw-r--r-- | sword2/sword2.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index 52af048cc3..6a8bb1ad21 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -103,7 +103,8 @@ KyraEngine::KyraEngine(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")); // gets the game if (detector->_game.features & GF_KYRA1) { diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index f5f1e6d48e..f64a77f219 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -145,6 +145,7 @@ int SwordEngine::init(GameDetector &detector) { debug(5, "Starting object manager"); _objectMan = new ObjectMan(_resMan); _mixer->setVolume(255); + _mixer->setMusicVolume(256); _mouse = new Mouse(_system, _resMan, _objectMan); _screen = new Screen(_system, _resMan, _objectMan); _music = new Music(_system, _mixer); diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index ffdb700d4a..b37d820eea 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -254,6 +254,7 @@ int Sword2Engine::init(GameDetector &detector) { // soften the sound in any way. _mixer->setVolume(256); + _mixer->setMusicVolume(256); // During normal gameplay, we care neither about mouse button releases // nor the scroll wheel. |