diff options
| author | Filippos Karapetis | 2009-12-23 13:29:06 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-23 13:29:06 +0000 |
| commit | dfd09bc025a031ff64a118c9ef04619ba4f3fc95 (patch) | |
| tree | a9df175fc81931486f4b47b83dffb5b50dacae9c /engines/sci/sfx/music.cpp | |
| parent | 162b6972207ae80e741d5671902b03cef8a142b9 (diff) | |
| download | scummvm-rg350-dfd09bc025a031ff64a118c9ef04619ba4f3fc95.tar.gz scummvm-rg350-dfd09bc025a031ff64a118c9ef04619ba4f3fc95.tar.bz2 scummvm-rg350-dfd09bc025a031ff64a118c9ef04619ba4f3fc95.zip | |
SCI/new music code: Do not cache the signal selector, as it needs to be always updated, so that animations can be synced properly by the game scripts. Fixes KQ6
svn-id: r46496
Diffstat (limited to 'engines/sci/sfx/music.cpp')
| -rw-r--r-- | engines/sci/sfx/music.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index e8f603c56f..c011a66a3d 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -353,7 +353,6 @@ void SciMusic::onTimer() { } else if (_playList[i]->pStreamAud) { if (!_pMixer->isSoundHandleActive(_playList[i]->hCurrentAud)) { _playList[i]->ticker = 0xFFFF; - _playList[i]->signal = 0xFFFF; _playList[i]->status = kStopped; // Signal the engine scripts that the sound is done playing @@ -530,6 +529,8 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { if (info.event < 0x80) return; + SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan; // HACK + _position._running_status = info.event; switch (info.command()) { case 0xC: @@ -537,7 +538,7 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { info.basic.param2 = 0; if (info.channel() == 0xF) {// SCI special case if (info.basic.param1 != 0x7F) - _pSnd->signal = info.basic.param1; + PUT_SEL32V(segMan, _pSnd->soundObj, signal, info.basic.param1); else _loopTick = _position._play_tick; } @@ -611,7 +612,7 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { _pSnd->loop--; } else { _pSnd->status = kStopped; - _pSnd->signal = 0xFFFF; + PUT_SEL32V(segMan, _pSnd->soundObj, signal, 0xFFFF); } } break; |