libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

AGOS: Make the "m" hotkey respect the mute setting.

Browse Source 
svn-id: r51102
This commit is contained in:
Johannes Schickel 2010-07-21 20:12:57 +00:00
parent e3d1ec482c
commit 97870a220d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agos/agos.cpp
View File

@ -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));

2
engines/agos/input.cpp
View File

@ -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) {