diff options
| author | Jamieson Christian | 2003-09-30 16:27:59 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-09-30 16:27:59 +0000 |
| commit | c24b06abedf940f372b4899716135173585a72fe (patch) | |
| tree | a66240099ca5b5b32c777d5dd1cc49e273a4bd12 /scumm | |
| parent | 46d195ee02899df46a2062a7375abf4db0e93c7b (diff) | |
| download | scummvm-rg350-c24b06abedf940f372b4899716135173585a72fe.tar.gz scummvm-rg350-c24b06abedf940f372b4899716135173585a72fe.tar.bz2 scummvm-rg350-c24b06abedf940f372b4899716135173585a72fe.zip | |
More tweaks to the note durations
svn-id: r10504
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/midiparser_eup.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp index e9546aa4dc..85276dad15 100644 --- a/scumm/midiparser_eup.cpp +++ b/scumm/midiparser_eup.cpp @@ -93,15 +93,7 @@ void MidiParser_EUP::parseNextEvent (EventInfo &info) { int volume = (int) pos[5] + _presets.volume[preset]; pos += 6; if (_presets.enable[preset]) { - // If the second half of the command pair is 8x, - // use four nibbles for the note duration. Otherwise - // assume it is 00 and only use two nibbles. This is - // a GUESS solution; however, it's clear from looking - // at Indy3-Towns dumps that 00 note off events use - // the third and fourth nibbles to report a "countdown" - // to the end of the song, for whatever weird reason. - uint16 duration = pos[1] | (pos[2] << 4) | - (((*pos & 0xF0) == 0x80) ? ((pos[3] << 8) | (pos[4] << 12)) : 0); + uint16 duration = pos[1] | (pos[2] << 4); info.start = pos; uint32 last = _position._last_event_tick; info.delta = (tick < last) ? 0 : (tick - last); |