[Scummvm-cvs-logs] scummvm master -> 97b255ab33fa5fcd4507573e77cd42a8406e1b55

m-kiewitz m_kiewitz at users.sourceforge.net
Sat Sep 21 19:42:02 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:
97b255ab33 SCI: fix dataInc signalling fixes bug #3035159


Commit: 97b255ab33fa5fcd4507573e77cd42a8406e1b55
    https://github.com/scummvm/scummvm/commit/97b255ab33fa5fcd4507573e77cd42a8406e1b55
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-21T10:41:45-07:00

Commit Message:
SCI: fix dataInc signalling fixes bug #3035159

we set signal in parseNextEvent on dataInc events, which then effectively triggered 2 cues through kDoSoundUpdateCues instead of one. Fixes Freddy Pharkas Ballad intro on floppy + demos

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 4b4333a..b367eee 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -444,7 +444,6 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 	if (_dataincAdd) {
 		_dataincAdd = false;
 		_pSnd->dataInc += _dataincToAdd;
-		_pSnd->signal = 0x7f + _pSnd->dataInc;
 		debugC(4, kDebugLevelSound, "datainc %04x", _dataincToAdd);
 	}
 	if (_signalSet) {






More information about the Scummvm-git-logs mailing list