[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.31,1.32

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv16292/scummvm/simon

Modified Files:
	midi.cpp 
Log Message:
Fix for simon2win music

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- midi.cpp	20 May 2003 16:50:16 -0000	1.31
+++ midi.cpp	20 May 2003 17:10:15 -0000	1.32
@@ -112,7 +112,7 @@
 }
 
 void MidiPlayer::jump (uint16 track, uint16 tick) {
-	if (track == _currentTrack || !_parser)
+	if (track == _currentTrack)
 		return;
 
 	if (_num_songs > 0) {
@@ -137,18 +137,16 @@
 		}
 
 		_currentTrack = (byte) track;
-		for (int i = ARRAYSIZE (_volumeTable); i; --i)
-			_volumeTable[i-1] = 127;
 		_parser = parser; // That plugs the power cord into the wall
 	} else if (_parser) {
 		_system->lock_mutex (_mutex);
 		_currentTrack = (byte) track;
-		_parser->setTrack ((byte) track);
 	}
 
+	_parser->setTrack ((byte) track);
 	_parser->jumpToTick (tick ? tick - 1 : 0);
-	pause (false);
 	_system->unlock_mutex (_mutex);
+	pause (false);
 }
 
 void MidiPlayer::stop() {