From 8f863b5d8ffeeefd75d9937eeafcc77db5923ba3 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 29 Nov 2004 00:25:15 +0000
Subject: Fix music volume

svn-id: r15960
---
 kyra/kyra.cpp     | 3 ++-
 sword1/sword1.cpp | 1 +
 sword2/sword2.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

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.
-- 
cgit v1.2.3