diff options
| author | uruk | 2014-07-25 22:43:20 +0200 |
|---|---|---|
| committer | uruk | 2014-07-25 22:43:20 +0200 |
| commit | ac178b6013f3a1b090cfca1d8e9e2ad6429f4e77 (patch) | |
| tree | 822b6c5f9945f3ac8dc934c51e15f02097091cee | |
| parent | eaddafdea707c03a7f4c6be0e7c24aafaae4dd34 (diff) | |
| download | scummvm-rg350-ac178b6013f3a1b090cfca1d8e9e2ad6429f4e77.tar.gz scummvm-rg350-ac178b6013f3a1b090cfca1d8e9e2ad6429f4e77.tar.bz2 scummvm-rg350-ac178b6013f3a1b090cfca1d8e9e2ad6429f4e77.zip | |
CGE2: Fix optionTouch().
Now you can't change the sound options via the toolbar if the Mute All option is checked in the GGM/Launcher.
| -rw-r--r-- | engines/cge2/toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp index d8687e3944..2242cc41ff 100644 --- a/engines/cge2/toolbar.cpp +++ b/engines/cge2/toolbar.cpp @@ -73,11 +73,11 @@ void CGE2Engine::optionTouch(int opt, uint16 mask) { quit(); break; case 4: - if (mask & (kMouseLeftUp | kMouseRightUp)) + if ((mask & (kMouseLeftUp | kMouseRightUp)) && !ConfMan.getBool("mute")) setVolume(opt - 4, (mask & kMouseLeftUp) ? 1 : -1); break; case 5: - if (mask & (kMouseLeftUp | kMouseRightUp)) + if ((mask & (kMouseLeftUp | kMouseRightUp)) && !ConfMan.getBool("mute")) setVolume(opt - 4, (mask & kMouseLeftUp) ? 1 : -1); break; case 8: |