[Scummvm-cvs-logs] SF.net SVN: scummvm:[49157] scummvm/trunk/engines/sci/sound/soundcmd.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 49157
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49157&view=rev
Author:   m_kiewitz
Date:     2010-05-23 13:22:58 +0000 (Sun, 23 May 2010)

Log Message:
-----------
SCI: fix regression of r49156 - if multiple songs are stored for resume-play, use the last one - fixes iceman wrong music played after going through door in room 14 - still not sure about this, added fixme

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-23 12:22:23 UTC (rev 49156)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-05-23 13:22:58 UTC (rev 49157)
@@ -1058,8 +1058,11 @@
 	for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
 		// Is the sound stopped, and the sound object updated too? If yes, skip
 		// this sound, as SCI0 only allows one active song
-		if  (((*i)->isQueued) && (!pWaitingForPlay)) {
+		if  ((*i)->isQueued) {
 			pWaitingForPlay = (*i);
+			// FIXME (?) - in iceman 2 songs are queued when playing the door sound - if we use the first song for resuming
+			//              then it's the wrong one. Both songs have same priority. Maybe the new sound function in sci0
+			//              is somehow responsible
 			continue;
 		}
 		if ((*i)->signal == 0 && (*i)->status != kSoundPlaying)


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