[Scummvm-cvs-logs] SF.net SVN: scummvm:[42385] scummvm/trunk/engines/sci

wjpalenstijn at users.sourceforge.net wjpalenstijn at users.sourceforge.net
Sat Jul 11 17:00:40 CEST 2009


Revision: 42385
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42385&view=rev
Author:   wjpalenstijn
Date:     2009-07-11 15:00:40 +0000 (Sat, 11 Jul 2009)

Log Message:
-----------
SCI: don't let TimerSongIterator loop forever, and don't immediately
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/sfx/iterator.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-07-11 14:55:08 UTC (rev 42384)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-07-11 15:00:40 UTC (rev 42385)
@@ -823,7 +823,6 @@
 				sampleLen = s->_sound.startAudio(65535, number);
 				// Also create iterator, that will fire SI_FINISHED event, when the sound is done playing
 				s->_sound.sfx_add_song(build_timeriterator(s, sampleLen), 0, handle, number);
-				PUT_SEL32V(obj, signal, sampleLen);
 			} else {
 				if (!s->resmgr->testResource(ResourceId(kResourceTypeSound, number))) {
 					warning("Could not open song number %d", number);

Modified: scummvm/trunk/engines/sci/sfx/iterator.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-07-11 14:55:08 UTC (rev 42384)
+++ scummvm/trunk/engines/sci/sfx/iterator.cpp	2009-07-11 15:00:40 UTC (rev 42385)
@@ -1173,7 +1173,9 @@
 
 int TimerSongIterator::nextCommand(byte *buf, int *result) {
 	if (_delta) {
-	   return _delta;
+		int d = _delta;
+		_delta = 0;
+		return d;
 	}
 	return SI_FINISHED;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list