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

CGE2: Add checkMute().

Browse Source 
This keeps the "Mute All" option of ScummVM and the music on/off and speech on/off buttons of Sfinx's toolbar in sync.
This commit is contained in:
uruk 2014-08-13 21:16:20 +02:00
parent d7a9ea9e2a
commit 12a894a803
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/cge2/cge2.cpp
View File

@ -99,9 +99,9 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription)
_sayCap = ConfMan.getBool("subtitles"); _sayCap = ConfMan.getBool("subtitles");
_sayVox = !ConfMan.getBool("speech_mute"); _sayVox = !ConfMan.getBool("speech_mute");
if (ConfMan.getBool("mute")) { if (_muteAll = ConfMan.getBool("mute")) {
_oldMusicVolume = _oldSfxVolume = 0; _oldMusicVolume = _oldSfxVolume = 0;
_music = false; _music = _sayVox = false;
} else { } else {
_oldMusicVolume = ConfMan.getInt("music_volume"); _oldMusicVolume = ConfMan.getInt("music_volume");
_oldSfxVolume = ConfMan.getInt("sfx_volume"); _oldSfxVolume = ConfMan.getInt("sfx_volume");

2
engines/cge2/cge2.h
View File

@ -225,6 +225,7 @@ public:
void switchSay(); void switchSay();
void initToolbar(); void initToolbar();
void initVolumeSwitch(Sprite *volSwitch, int val); void initVolumeSwitch(Sprite *volSwitch, int val);
void checkMute();
void checkSounds(); void checkSounds();
@ -306,6 +307,7 @@ public:
int _oldMusicVolume; int _oldMusicVolume;
int _oldSfxVolume; int _oldSfxVolume;
bool _music; bool _music;
bool _muteAll;
ResourceManager *_resman; ResourceManager *_resman;
Vga *_vga; Vga *_vga;

1
engines/cge2/cge2_main.cpp
View File

@ -540,6 +540,7 @@ void CGE2Engine::mainLoop() {
} }
void CGE2Engine::checkSounds() { void CGE2Engine::checkSounds() {
checkMute();
_sound->checkSoundHandles(); _sound->checkSoundHandles();
checkVolumeSwitches(); checkVolumeSwitches();
_midiPlayer->syncVolume(); _midiPlayer->syncVolume();

10
engines/cge2/toolbar.cpp
View File

@ -212,4 +212,14 @@ void CGE2Engine::initVolumeSwitch(Sprite *volSwitch, int val) {
volSwitch->step(state); volSwitch->step(state);
} }
void CGE2Engine::checkMute() {
bool mute = ConfMan.getBool("mute");
bool mutedChanged = mute != _muteAll;
if (mutedChanged) {
switchMusic();
switchVox();
_muteAll = mute;
}
}
} // End of namespace CGE2 } // End of namespace CGE2