[Scummvm-cvs-logs] scummvm master -> 5b23a251ceefaecdd4d46e1b27835adaf7dd7f99
wjp
wjp at usecode.org
Thu Sep 19 23:54:55 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5b23a251ce SCI: Fix too strict assert triggering in LSL5
Commit: 5b23a251ceefaecdd4d46e1b27835adaf7dd7f99
https://github.com/scummvm/scummvm/commit/5b23a251ceefaecdd4d46e1b27835adaf7dd7f99
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-09-19T14:54:27-07:00
Commit Message:
SCI: Fix too strict assert triggering in LSL5
Changed paths:
engines/sci/sound/midiparser_sci.cpp
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 7640c5f..4b4333a 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -663,7 +663,10 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
// as there aren't any subsequent MIDI events after this one.
// This assert is here to detect cases where the song ends
// up jumping forward, like with bug #3614566 (see above).
- assert(_loopTick + info.delta < _position._playTick);
+ // (Exception: delta == 0, in which case the loop points
+ // at the previous event, which is fine.)
+ assert(_loopTick + info.delta < _position._playTick ||
+ ((_loopTick == _position._playTick && info.delta == 0)));
uint32 extraDelta = info.delta;
_pSnd->inFastForward = true;
More information about the Scummvm-git-logs
mailing list