From ebd3510b72aeff0021c2676ddfb08f12c3697b11 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Mon, 14 Jul 2008 22:10:04 +0000
Subject: AGOS: Got rid of _masterVolume and replaced with _musicVolume and
 _sfxVolume so that music and sfx are separately controlled via the Options
 menu

svn-id: r33065
---
 engines/agos/agos.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/agos/agos.cpp')

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index a6e559726a..f6f597649f 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -572,7 +572,7 @@ int AGOSEngine::init() {
 		if (ret)
 			warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret));
 
-		_midi.setVolume(ConfMan.getInt("music_volume"));
+		_midi.setVolume(ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume"));
 
 
 		_midiEnabled = true;
@@ -1083,7 +1083,8 @@ uint32 AGOSEngine::getTime() const {
 void AGOSEngine::syncSoundSettings() {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
-	_midi.setVolume(ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+	_midi.setVolume(ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume"));
 }
 
 } // End of namespace AGOS
-- 
cgit v1.2.3