diff options
| author | Max Horn | 2002-10-21 22:03:59 +0000 |
|---|---|---|
| committer | Max Horn | 2002-10-21 22:03:59 +0000 |
| commit | d58c7d43f0c6ce9cb1e708521120700c90046559 (patch) | |
| tree | 03ffae31567d29486f68cfc69ebd5a0440cc7a9d | |
| parent | dfee215a1b4f9c2cf4837c72ab6951526a29c959 (diff) | |
| download | scummvm-rg350-d58c7d43f0c6ce9cb1e708521120700c90046559.tar.gz scummvm-rg350-d58c7d43f0c6ce9cb1e708521120700c90046559.tar.bz2 scummvm-rg350-d58c7d43f0c6ce9cb1e708521120700c90046559.zip | |
fixed simon2win midi (I hope), bug #595813
svn-id: r5222
| -rw-r--r-- | simon/midi.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index 19d573a935..2a3c45eb41 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -79,11 +79,10 @@ void MidiPlayer::read_mthd(File *in, Song *s, bool old) for (i = 0; i != s->num_tracks; i++, t++) { if (!old) { - uint32 foo = in->readUint32BE(); - if (foo != 'MTrk') - error("Midi track has no 'MTrk' (%d, %08x)", i, foo); + if (in->readUint32BE() != 'MTrk') + error("Midi track has no 'MTrk'", i, foo); - t->data_size = in->readUint32LE(); + t->data_size = in->readUint32BE(); } else { uint32 pos = in->pos(); in->seek(0, SEEK_END); |