aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2010-07-21 20:12:57 +0000
committerJohannes Schickel2010-07-21 20:12:57 +0000
commit97870a220de94ded0d7f0c70a6008c4d47b424ed (patch)
tree94765d8c2791974ece35948bc4841a93b7d9132b /engines
parente3d1ec482c510d0b7a851cb0d2a675bad79a2ec9 (diff)
downloadscummvm-rg350-97870a220de94ded0d7f0c70a6008c4d47b424ed.tar.gz
scummvm-rg350-97870a220de94ded0d7f0c70a6008c4d47b424ed.tar.bz2
scummvm-rg350-97870a220de94ded0d7f0c70a6008c4d47b424ed.zip
AGOS: Make the "m" hotkey respect the mute setting.
svn-id: r51102
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.cpp2
-rw-r--r--engines/agos/input.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 5e78a5d52a..670c701198 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -1048,7 +1048,7 @@ void AGOSEngine::syncSoundSettings() {
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));
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 5fc2a64416..1246149aa5 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -602,7 +602,7 @@ bool AGOSEngine::processSpecialKeys() {
if (_midiEnabled) {
_midi.pause(_musicPaused);
}
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (_musicPaused) ? 0 : ConfMan.getInt("music_volume"));
+ syncSoundSettings();
break;
case 's':
if (getGameId() == GID_SIMON1DOS) {