diff options
| author | Jamieson Christian | 2003-05-19 05:00:13 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-19 05:00:13 +0000 |
| commit | ff418964800f14c6041b072c8d510005929c19f2 (patch) | |
| tree | 26c44b53ac1870db5ef234ecc9e3e01aa635ff8b /simon/simon.cpp | |
| parent | 243bcc74d3f44868d5e0e9805a390efb690d8e73 (diff) | |
| download | scummvm-rg350-ff418964800f14c6041b072c8d510005929c19f2.tar.gz scummvm-rg350-ff418964800f14c6041b072c8d510005929c19f2.tar.bz2 scummvm-rg350-ff418964800f14c6041b072c8d510005929c19f2.zip | |
Fixed Simon 1 music regression.
SMF parser now supports malformed Simon pitch bend events.
Implemented SMF parser jump method.
svn-id: r7669
Diffstat (limited to 'simon/simon.cpp')
| -rw-r--r-- | simon/simon.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 8f5f4f561f..e216d669e4 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -862,10 +862,7 @@ void SimonState::playSting(uint a) { // midi.shutdown(); _mus_file->seek(_mus_offsets[a], SEEK_SET); - // midi.read_all_songs_old(_mus_file, a, _mus_offsets[a+1] - _mus_offsets[a]); - // midi.initialize(); - // midi.play(); - midi.playSMF (_mus_file); + midi.playSMF (_mus_file, a); } Subroutine *SimonState::getSubroutineByID(uint subroutine_id) { @@ -5072,7 +5069,7 @@ void SimonState::playMusic(uint music_unk, uint music) { midi.playMultipleSMF (_game_file); } else if (_game & GF_TALKIE) { _game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET); - midi.playSMF (_game_file); + midi.playSMF (_game_file, music); } else { char buf[50]; File *f = new File(); @@ -5082,7 +5079,7 @@ void SimonState::playMusic(uint music_unk, uint music) { warning("Can't load music from '%s'", buf); return; } - midi.playSMF (f); + midi.playSMF (f, music); delete f; } } |