From 99503e3a32ecd8e5631f54840f91a66a08b6717a Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 29 Nov 2004 00:17:03 +0000
Subject: Fix music volume

svn-id: r15959
---
 saga/saga.cpp | 3 ++-
 sky/sky.cpp   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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