diff options
| author | Martin Kiewitz | 2010-05-20 06:11:46 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-20 06:11:46 +0000 |
| commit | 5f8778395af3140f40f29415d320e7e1155f7ada (patch) | |
| tree | cc78a9284e59c10d0a60bdbea6dc10862a6df9f8 | |
| parent | a0db16294a6ce9bdc737e60586abcef7ec7a2dec (diff) | |
| download | scummvm-rg350-5f8778395af3140f40f29415d320e7e1155f7ada.tar.gz scummvm-rg350-5f8778395af3140f40f29415d320e7e1155f7ada.tar.bz2 scummvm-rg350-5f8778395af3140f40f29415d320e7e1155f7ada.zip | |
SCI: fix regression of r49109 - only queue up midi sounds
svn-id: r49114
| -rw-r--r-- | engines/sci/sound/music.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 5c67cefc40..66f5ce9710 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -249,7 +249,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { for (uint i = 0; i < playListCount; i++) { if (_playList[i] == pSnd) playListNo = i; - if (_playList[i]->status == kSoundPlaying) + if ((_playList[i]->status == kSoundPlaying) && (_playList[i]->pMidiParser)) alreadyPlaying = true; } if (playListNo == playListCount) { // not found @@ -259,14 +259,16 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { _mutex.unlock(); // unlock to perform mixer-related calls - if ((_soundVersion <= SCI_VERSION_0_LATE) && (alreadyPlaying)) { - // if any music is already playing, SCI0 queues music and plays it after the current music has finished - // done by SoundCommandParser::updateSci0Cues() - // Example of such case: iceman room 14 - // FIXME: this code is supposed to also take a look at priority and pause currently playing sound accordingly - pSnd->isQueued = true; - pSnd->status = kSoundPaused; - return; + if (pSnd->pMidiParser) { + if ((_soundVersion <= SCI_VERSION_0_LATE) && (alreadyPlaying)) { + // if any music is already playing, SCI0 queues music and plays it after the current music has finished + // done by SoundCommandParser::updateSci0Cues() + // Example of such case: iceman room 14 + // FIXME: this code is supposed to also take a look at priority and pause currently playing sound accordingly + pSnd->isQueued = true; + pSnd->status = kSoundPaused; + return; + } } if (pSnd->pStreamAud && !_pMixer->isSoundHandleActive(pSnd->hCurrentAud)) { |