[Scummvm-cvs-logs] SF.net SVN: scummvm:[51102] scummvm/trunk/engines/agos

[lordhoto at users.sourceforge.net]

Revision: 51102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51102&view=rev
Author:   lordhoto
Date:     2010-07-21 20:12:57 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
AGOS: Make the "m" hotkey respect the mute setting.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/input.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2010-07-21 20:12:35 UTC (rev 51101)
+++ scummvm/trunk/engines/agos/agos.cpp	2010-07-21 20:12:57 UTC (rev 51102)
@@ -1048,7 +1048,7 @@
 	if (ConfMan.hasKey("mute"))
 		mute = ConfMan.getBool("mute");
 
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : soundVolumeMusic));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : (_musicPaused ? 0 : soundVolumeMusic)));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX));
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech));
 

Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp	2010-07-21 20:12:35 UTC (rev 51101)
+++ scummvm/trunk/engines/agos/input.cpp	2010-07-21 20:12:57 UTC (rev 51102)
@@ -602,7 +602,7 @@
 		if (_midiEnabled) {
 			_midi.pause(_musicPaused);
 		}
-		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (_musicPaused) ? 0 : ConfMan.getInt("music_volume"));
+		syncSoundSettings();
 		break;
 	case 's':
 		if (getGameId() == GID_SIMON1DOS) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.