diff options
| author | Travis Howell | 2007-06-10 06:08:59 +0000 | 
|---|---|---|
| committer | Travis Howell | 2007-06-10 06:08:59 +0000 | 
| commit | 0a11c241d578733a268be7db31a47d108a52d556 (patch) | |
| tree | 027f5c526aec912412a1b877d95f42c601b52c3e | |
| parent | 3cd6c3c2758e4447622663399d3eb39be15e5189 (diff) | |
| download | scummvm-rg350-0a11c241d578733a268be7db31a47d108a52d556.tar.gz scummvm-rg350-0a11c241d578733a268be7db31a47d108a52d556.tar.bz2 scummvm-rg350-0a11c241d578733a268be7db31a47d108a52d556.zip | |
Fix muting music on startup in games, when using non-MIDI music.
svn-id: r27284
| -rw-r--r-- | engines/agos/agos.cpp | 10 | 
1 files changed, 8 insertions, 2 deletions
| diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index b3a2c35fd5..cef31c7de1 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -596,8 +596,6 @@ int AGOSEngine::init() {  		_midi.setVolume(ConfMan.getInt("music_volume")); -		if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1) -			_midi.pause(_musicPaused ^= 1);  		_midiEnabled = true;  	} @@ -633,6 +631,14 @@ int AGOSEngine::init() {  	_moviePlay = new MoviePlayer(this, _mixer); +	if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1) { +		_musicPaused = true; +		if (_midiEnabled) { +			_midi.pause(_musicPaused); +		} +		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 0); +	} +  	if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) {  		if (getGameId() == GID_SIMON1DOS)  			_midi._enable_sfx ^= 1; | 
