diff options
| author | Martin Kiewitz | 2010-07-19 07:29:17 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-07-19 07:29:17 +0000 |
| commit | d952e48a57a8efb7c6b8fbe8163cbde889b7e88f (patch) | |
| tree | 40cd3060e42abd976528d881f1372e1238b66121 | |
| parent | 75dd75a73767319b2797a140f985dfc356462862 (diff) | |
| download | scummvm-rg350-d952e48a57a8efb7c6b8fbe8163cbde889b7e88f.tar.gz scummvm-rg350-d952e48a57a8efb7c6b8fbe8163cbde889b7e88f.tar.bz2 scummvm-rg350-d952e48a57a8efb7c6b8fbe8163cbde889b7e88f.zip | |
SCI: change kDoSound(updateCues) for samples
only set signal when sample was/is playing, fixes qfg2 genie intro
svn-id: r51017
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 30b7c97a94..316468eee4 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -379,10 +379,12 @@ void SoundCommandParser::processUpdateCues(reg_t obj) { musicSlot->loop -= currentLoopCounter - musicSlot->sampleLoopCounter; musicSlot->sampleLoopCounter = currentLoopCounter; } - if ((!_music->soundIsActive(musicSlot)) && (musicSlot->status != kSoundPaused)) { - processStopSound(obj, true); - } else { - _music->updateAudioStreamTicker(musicSlot); + if (musicSlot->status == kSoundPlaying) { + if (!_music->soundIsActive(musicSlot)) { + processStopSound(obj, true); + } else { + _music->updateAudioStreamTicker(musicSlot); + } } // We get a flag from MusicEntry::doFade() here to set volume for the stream if (musicSlot->fadeSetVolume) { |