thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: reenabling "stopAllSounds" code disabled in r49101 - isn't called anymore since priority is honored so it may have been right after all

Browse source 
svn-id: r49158
This commit is contained in:
Martin Kiewitz 2010-05-23 16:42:49 +00:00
parent d27e32aa19
commit b069b9fe96
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -927,11 +927,6 @@ void SoundCommandParser::cmdStopAllSounds(reg_t obj, int16 value) {
#ifndef USE_OLD_MUSIC_FUNCTIONS #ifndef USE_OLD_MUSIC_FUNCTIONS
Common::StackLock(_music->_mutex); Common::StackLock(_music->_mutex);
// FIXME: this can't be right, it's called in iceman (room 14) when the door sound has done playing
// stopping sounds can't be right, because music is starting afterwards in ssci. can't be resume queued
// song(s), because music is playing even when this call is nuked inside ssci.
return;
const MusicList::iterator end = _music->getPlayListEnd(); const MusicList::iterator end = _music->getPlayListEnd();
for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) { for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
if (_soundVersion <= SCI_VERSION_0_LATE) { if (_soundVersion <= SCI_VERSION_0_LATE) {