diff options
| author | Torbjörn Andersson | 2004-05-01 16:49:23 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-05-01 16:49:23 +0000 |
| commit | 4110aeb5d5c671cf6710802b8c405e65be757622 (patch) | |
| tree | 72bc2fc64e99d132581196409895ffa6241b517c /saga/music.cpp | |
| parent | 3ebb895e9a071d4d4363e774ee9831620de2017f (diff) | |
| download | scummvm-rg350-4110aeb5d5c671cf6710802b8c405e65be757622.tar.gz scummvm-rg350-4110aeb5d5c671cf6710802b8c405e65be757622.tar.bz2 scummvm-rg350-4110aeb5d5c671cf6710802b8c405e65be757622.zip | |
With Jamieson630's MIDI parser fix, all the ITE MIDIs should work.
svn-id: r13720
Diffstat (limited to 'saga/music.cpp')
| -rw-r--r-- | saga/music.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index 9993681041..8479beca5d 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -159,7 +159,7 @@ Music::~Music() { int Music::play(uint32 music_rn, uint16 flags) { R_RSCFILE_CONTEXT *rsc_ctxt = NULL; - const char *midi_file = NULL; + const char *midi_file; byte *resource_data; size_t resource_size; @@ -218,27 +218,19 @@ int Music::play(uint32 music_rn, uint16 flags) { break; case XXX: midi_file = "exploreb"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "explorec"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "fvillage"; break; case XXX: midi_file = "humruinm"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; #endif case 10: midi_file = "intro"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; #if 0 case XXX: @@ -249,43 +241,27 @@ int Music::play(uint32 music_rn, uint16 flags) { break; case XXX: midi_file = "nitstrlm"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "orbtempl"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "reset"; - // Unfortunately, our MIDI parser won't handle the above file, - // but I'm not sure we need it anyway - midi_file = NULL; break; case XXX: midi_file = "shiala"; break; case XXX: midi_file = "spooky"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "sunstatm"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "sweet"; - // Unfortunately, our MIDI parser won't handle the above file - midi_file = NULL; break; case XXX: midi_file = "tychom"; - // Unlike the other unhandled files, ScummVM won't crash on - // this one. But it won't play anything either. - midi_file = NULL; break; #endif default: |