diff options
| author | Filippos Karapetis | 2013-07-07 19:41:42 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2013-07-07 19:41:42 +0300 |
| commit | 0f30ba2f10df20cbe57f67fcf98b3125c1c57e5f (patch) | |
| tree | 7961b11148917d11306dc374679af3ee5994b6b2 /engines/sci/sound/midiparser_sci.h | |
| parent | a949a88220eea86cb15182daccd34a269ff7d6dd (diff) | |
| download | scummvm-rg350-0f30ba2f10df20cbe57f67fcf98b3125c1c57e5f.tar.gz scummvm-rg350-0f30ba2f10df20cbe57f67fcf98b3125c1c57e5f.tar.bz2 scummvm-rg350-0f30ba2f10df20cbe57f67fcf98b3125c1c57e5f.zip | |
SCI: Fix bug #3614566 - "LSL6: ScummVM locks up at Electro-Shock room"
We now do the jumpToTick() for hold events after waiting for the delta
of the current event, like we do for the signal set events. This keeps
the fixes for the hold timings in QFG3, while not breaking LSL6.
Many thanks to wjp for pinpointing the actual cause of the issue.
Diffstat (limited to 'engines/sci/sound/midiparser_sci.h')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h index d3fd337644..7bd68994c8 100644 --- a/engines/sci/sound/midiparser_sci.h +++ b/engines/sci/sound/midiparser_sci.h @@ -110,6 +110,7 @@ protected: int16 _signalToSet; bool _dataincAdd; int16 _dataincToAdd; + bool _jumpToHoldTick; bool _resetOnPause; bool _channelUsed[16]; |