[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,2.13,2.14
Jamieson Christian
jamieson630 at users.sourceforge.net
Thu Jul 31 00:35:09 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10706/scummvm/scumm
Modified Files:
imuse_player.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: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- imuse_player.cpp 27 Jun 2003 19:31:36 -0000 2.13
+++ imuse_player.cpp 31 Jul 2003 06:50:13 -0000 2.14
@@ -698,8 +698,8 @@
bool Player::jump(uint track, uint beat, uint tick) {
if (!_parser)
return false;
- _track_index = track;
- _parser->setTrack (track);
+ if (_parser->setTrack (track))
+ _track_index = track;
if (!_parser->jumpToTick ((beat - 1) * TICKS_PER_BEAT + tick))
return false;
turn_off_pedals();
More information about the Scummvm-git-logs
mailing list