diff options
author | Filippos Karapetis | 2010-01-27 21:11:24 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-01-27 21:11:24 +0000 |
commit | 76ff84a62fcbec28b58ab14a157ec9fc74dd05d6 (patch) | |
tree | 5613fb6b362df23f1861782c2c3e199bd28839b8 /engines/sci/sound/music.cpp | |
parent | e81ddfcdccffa431532d5e6d604d49084dd212b4 (diff) | |
download | scummvm-rg350-76ff84a62fcbec28b58ab14a157ec9fc74dd05d6.tar.gz scummvm-rg350-76ff84a62fcbec28b58ab14a157ec9fc74dd05d6.tar.bz2 scummvm-rg350-76ff84a62fcbec28b58ab14a157ec9fc74dd05d6.zip |
Fixed the demo version of Longbow - speech was not played at all with the new sound code
svn-id: r47610
Diffstat (limited to 'engines/sci/sound/music.cpp')
-rw-r--r-- | engines/sci/sound/music.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 3bb3f5e8df..85088a882b 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -170,15 +170,15 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) { int channelFilterMask = 0; SoundResource::Track *track = pSnd->soundRes->getTrackByType(_pMidiDrv->getPlayId()); - if (track) { - // If MIDI device is selected but there is no digital track in sound resource - // try to use adlib's digital sample if possible - if (_bMultiMidi && (track->digitalChannelNr == -1)) { - SoundResource::Track *digital = pSnd->soundRes->getDigitalTrack(); - if (digital) - track = digital; - } + // If MIDI device is selected but there is no digital track in sound resource + // try to use adlib's digital sample if possible + if (_bMultiMidi && (!track || track->digitalChannelNr == -1)) { + SoundResource::Track *digital = pSnd->soundRes->getDigitalTrack(); + if (digital) + track = digital; + } + if (track) { // Play digital sample if (track->digitalChannelNr != -1) { byte *channelData = track->channels[track->digitalChannelNr].data; |