diff options
| author | Paul Gilbert | 2010-09-11 05:28:54 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2010-09-11 05:28:54 +0000 |
| commit | 70fed746df6ab0ff7fe2c80725fb0c94b8ea821a (patch) | |
| tree | 162db95f88c7f297cbf8cf42391cfbd761ec27f5 /engines/tinsel/music.cpp | |
| parent | 77c43f4d0dad81d31a502320e0d423e0f50cb17a (diff) | |
| download | scummvm-rg350-70fed746df6ab0ff7fe2c80725fb0c94b8ea821a.tar.gz scummvm-rg350-70fed746df6ab0ff7fe2c80725fb0c94b8ea821a.tar.bz2 scummvm-rg350-70fed746df6ab0ff7fe2c80725fb0c94b8ea821a.zip | |
TINSEL: Fix for #3032780 - Mute not respected in DW1
svn-id: r52674
Diffstat (limited to 'engines/tinsel/music.cpp')
| -rw-r--r-- | engines/tinsel/music.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index ea34fa963a..9560624e05 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -158,7 +158,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { if (TinselV1PSX) return false; if (_vm->_config->_musicVolume != 0) { - SetMidiVolume(_vm->_config->_musicVolume); + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); + + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); } // the index and length of the last tune loaded @@ -967,8 +971,12 @@ void RestoreMidiFacts(SCNHANDLE Midi, bool Loop) { currentLoop = Loop; if (_vm->_config->_musicVolume != 0 && Loop) { + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); + PlayMidiSequence(currentMidi, true); - SetMidiVolume(_vm->_config->_musicVolume); + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); } } |