diff options
| author | James Brown | 2004-11-11 14:01:11 +0000 |
|---|---|---|
| committer | James Brown | 2004-11-11 14:01:11 +0000 |
| commit | cb4b3c1f7ee5a56d50307e75de6462b7d259903f (patch) | |
| tree | 67576ec495a32aaa3ce61514bad3b55126961cc2 /sound | |
| parent | 1f7ccd02938a1e418bf83ed44014631187df7fcb (diff) | |
| download | scummvm-rg350-cb4b3c1f7ee5a56d50307e75de6462b7d259903f.tar.gz scummvm-rg350-cb4b3c1f7ee5a56d50307e75de6462b7d259903f.tar.bz2 scummvm-rg350-cb4b3c1f7ee5a56d50307e75de6462b7d259903f.zip | |
Prevent infinite loop by displaying the launcher after a game start FAILURE too.
svn-id: r15787
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/midiparser.cpp | 4 | ||||
| -rw-r--r-- | sound/midiparser.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/midiparser.cpp b/sound/midiparser.cpp index 48d8f6d0d1..f41580e665 100644 --- a/sound/midiparser.cpp +++ b/sound/midiparser.cpp @@ -181,8 +181,8 @@ void MidiParser::onTimer() { _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) { diff --git a/sound/midiparser.h b/sound/midiparser.h index 3e86181fb1..a9c2650915 100644 --- a/sound/midiparser.h +++ b/sound/midiparser.h @@ -277,7 +277,9 @@ protected: 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. |