aboutsummaryrefslogtreecommitdiff
path: root/kyra/kyra.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2004-11-29 00:25:15 +0000
committerEugene Sandulenko2004-11-29 00:25:15 +0000
commit8f863b5d8ffeeefd75d9937eeafcc77db5923ba3 (patch)
tree457a5386876f5321b67d4f3949087ae6b95318ee /kyra/kyra.cpp
parent99503e3a32ecd8e5631f54840f91a66a08b6717a (diff)
downloadscummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.tar.gz
scummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.tar.bz2
scummvm-rg350-8f863b5d8ffeeefd75d9937eeafcc77db5923ba3.zip
Fix music volume
svn-id: r15960
Diffstat (limited to 'kyra/kyra.cpp')
-rw-r--r--kyra/kyra.cpp3
1 files changed, 2 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) {