[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.cpp,1.22,1.23 midiparser.h,1.24,1.25

[James Brown]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14069/sound

Modified Files:
	midiparser.cpp midiparser.h 
Log Message:
Prevent infinite loop by displaying the launcher after a game start FAILURE too.


Index: midiparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- midiparser.cpp	31 May 2004 08:51:10 -0000	1.22
+++ midiparser.cpp	11 Nov 2004 14:01:10 -0000	1.23
@@ -181,8 +181,8 @@
 		_position._last_event_tick += info.delta;
 		if (info.event < 0x80) {
 			warning("Bad command or running status %02X", info.event);
-			_position._play_pos = 0;
-			return;
+			//_position._play_pos = 0;
+			//return;
 		}
 
 		if (info.event == 0xF0) {

Index: midiparser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- midiparser.h	6 Jan 2004 12:45:33 -0000	1.24
+++ midiparser.h	11 Nov 2004 14:01:11 -0000	1.25
@@ -277,7 +277,9 @@
 	bool   _autoLoop;       //!< For lightweight clients that don't provide their own flow control.
 	bool   _smartJump;      //!< Support smart expiration of hanging notes when jumping
 
-	byte * _tracks[32];     //!< Multi-track MIDI formats are supported, up to 32 tracks.
+	// FIXME: ? Was 32 here, Kyra tracks use 120(!!!) which seems wrong. this is a hacky
+	// workaround until situation is investigated.
+	byte * _tracks[120];     //!< Multi-track MIDI formats are supported, up to 120 tracks.
 	byte   _num_tracks;     //!< Count of total tracks for multi-track MIDI formats. 1 for single-track formats.
 	byte   _active_track;   //!< Keeps track of the currently active track, in multi-track formats.