[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.cpp,1.15,1.16

Jamieson Christian jamieson630 at users.sourceforge.net
Thu Jul 31 00:35:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv10706/scummvm/sound

Modified Files:
	midiparser.cpp 
Log Message:
Fix for RC bug [780675] MI2: Reoccuring crash

Tightened up OOB track selection handling in
MidiParser. Apparently some SMFs in the Mac
version of MI2 (and other games?) specify
track -1 in their jump commands to indicate
a jump within the same track.

Index: midiparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- midiparser.cpp	26 Jul 2003 19:37:54 -0000	1.15
+++ midiparser.cpp	31 Jul 2003 06:50:13 -0000	1.16
@@ -252,7 +252,7 @@
 }
 
 bool MidiParser::setTrack (int track) {
-	if (track >= _num_tracks)
+	if (track < 0 || track >= _num_tracks)
 		return false;
 	else if (track == _active_track)
 		return true;





More information about the Scummvm-git-logs mailing list