diff options
| author | Jamieson Christian | 2003-04-19 14:23:40 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-04-19 14:23:40 +0000 |
| commit | 2a1e87fa7c0d0a97c689b317e130fecff04ec34c (patch) | |
| tree | ccd3f088a715b07d2f6ef118934c65c852219810 /scumm/imuse.cpp | |
| parent | 4ca9454f869a8f88a7e260e3c65f4c36578d6dd4 (diff) | |
| download | scummvm-rg350-2a1e87fa7c0d0a97c689b317e130fecff04ec34c.tar.gz scummvm-rg350-2a1e87fa7c0d0a97c689b317e130fecff04ec34c.tar.bz2 scummvm-rg350-2a1e87fa7c0d0a97c689b317e130fecff04ec34c.zip | |
Revised fix to bug [666187] DOTT: Coffee music never stops
svn-id: r7021
Diffstat (limited to 'scumm/imuse.cpp')
| -rw-r--r-- | scumm/imuse.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 4d590a63e4..5d44d7c1e5 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -2402,7 +2402,7 @@ bool Player::jump(uint track, uint beat, uint tick) { topos = (beat - 1) * _ticks_per_beat + tick; - if (track == _track_index && topos >= _cur_pos) { + if (track == _track_index && topos >= _next_pos) { scanpos = _song_offset + mtrk; curpos = _next_pos; } else { @@ -2427,7 +2427,7 @@ bool Player::jump(uint track, uint beat, uint tick) { _beat_index = beat; _tick_index = tick; - _cur_pos = curpos; // topos; + _cur_pos = topos; _next_pos = curpos; _timer_counter = 0; _song_offset = track_offs; @@ -2840,8 +2840,8 @@ void Player::sequencer_timer() { if (!song_ptr || _abort) return; _next_pos += get_delta_time(&song_ptr); + _song_offset = song_ptr - mtrk; } - _song_offset = song_ptr - mtrk; } } } |