diff options
| author | Johannes Schickel | 2009-08-12 23:16:35 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-12 23:16:35 +0000 |
| commit | 57566ad337415f639cfedbc38a668d75f8272135 (patch) | |
| tree | 757691674950afd30f061ab3a0edd8081b67baf3 | |
| parent | 71750b6d06455728dcc1472c192403c1b029975e (diff) | |
| download | scummvm-rg350-57566ad337415f639cfedbc38a668d75f8272135.tar.gz scummvm-rg350-57566ad337415f639cfedbc38a668d75f8272135.tar.bz2 scummvm-rg350-57566ad337415f639cfedbc38a668d75f8272135.zip | |
Properly respect users sfx/music config settings for MIDI output.
svn-id: r43332
| -rw-r--r-- | engines/kyra/sound_midi.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp index 451b77cec2..28d4844d7d 100644 --- a/engines/kyra/sound_midi.cpp +++ b/engines/kyra/sound_midi.cpp @@ -658,6 +658,9 @@ void SoundMidiPC::loadSfxFile(Common::String file) { } void SoundMidiPC::playTrack(uint8 track) { + if (!_musicEnabled) + return; + haltTrack(); Common::StackLock lock(_mutex); @@ -685,6 +688,9 @@ bool SoundMidiPC::isPlaying() { } void SoundMidiPC::playSoundEffect(uint8 track) { + if (!_sfxEnabled) + return; + Common::StackLock lock(_mutex); for (int i = 0; i < 3; ++i) { if (!_sfx[i]->isPlaying()) { |