[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.18,2.19

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5954/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
Revised fix to bug [666187] DOTT: Coffee music never stops

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- imuse.cpp	18 Apr 2003 14:38:31 -0000	2.18
+++ imuse.cpp	19 Apr 2003 14:23:40 -0000	2.19
@@ -2402,7 +2402,7 @@
 
 	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 @@
 
 	_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 @@
 				if (!song_ptr || _abort)
 					return;
 				_next_pos += get_delta_time(&song_ptr);
+				_song_offset = song_ptr - mtrk;
 			}
-			_song_offset = song_ptr - mtrk;
 		}
 	}
 }