libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-26 14:27:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r49157
This commit is contained in:
Martin Kiewitz 2010-05-23 13:22:58 +00:00
parent aa4ae667a9
commit d27e32aa19
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sci/sound/soundcmd.cpp
View File

@ -1058,8 +1058,11 @@ void SoundCommandParser::updateSci0Cues() {
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)