[Scummvm-cvs-logs] scummvm master -> 2fc1f7eddae6fd1573e0ababce58b94414d70047
m-kiewitz
m_kiewitz at users.sourceforge.net
Mon Sep 16 00:36:48 CEST 2013
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1c9316cee0 SCI: longbow intro night rider fix (with help of wjp) - seems to fix bug 3489094
2fc1f7edda Merge branch 'master' of github.com:scummvm/scummvm
Commit: 1c9316cee03c5e2f694cf630b231f21e5c5ad32a
https://github.com/scummvm/scummvm/commit/1c9316cee03c5e2f694cf630b231f21e5c5ad32a
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-15T15:34:49-07:00
Commit Message:
SCI: longbow intro night rider fix (with help of wjp) - seems to fix bug 3489094
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 f045144..7640c5f 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -455,7 +455,9 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
}
if (_jumpToHoldTick) {
_jumpToHoldTick = false;
+ _pSnd->inFastForward = true;
jumpToTick(_loopTick, false, false);
+ _pSnd->inFastForward = false;
}
info.start = _position._playPos;
@@ -664,7 +666,9 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
assert(_loopTick + info.delta < _position._playTick);
uint32 extraDelta = info.delta;
+ _pSnd->inFastForward = true;
jumpToTick(_loopTick);
+ _pSnd->inFastForward = false;
_nextEvent.delta += extraDelta;
} else {
_pSnd->status = kSoundStopped;
Commit: 2fc1f7eddae6fd1573e0ababce58b94414d70047
https://github.com/scummvm/scummvm/commit/2fc1f7eddae6fd1573e0ababce58b94414d70047
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-15T15:35:29-07:00
Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes2.cpp
engines/tsage/ringworld2/ringworld2_scenes2.h
engines/tsage/staticres.cpp
More information about the Scummvm-git-logs
mailing list