aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-05-23 16:42:49 +0000
committerMartin Kiewitz2010-05-23 16:42:49 +0000
commitb069b9fe9691f1285446a89152cb9e295d15807c (patch)
tree51a127f7a7660c372dfed40c475258f212e00020 /engines/sci
parentd27e32aa196afec2f2df20fea943a4b6978650b3 (diff)
downloadscummvm-rg350-b069b9fe9691f1285446a89152cb9e295d15807c.tar.gz
scummvm-rg350-b069b9fe9691f1285446a89152cb9e295d15807c.tar.bz2
scummvm-rg350-b069b9fe9691f1285446a89152cb9e295d15807c.zip
SCI: reenabling "stopAllSounds" code disabled in r49101 - isn't called anymore since priority is honored so it may have been right after all
svn-id: r49158
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sound/soundcmd.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 272337148c..40e3637372 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -927,11 +927,6 @@ void SoundCommandParser::cmdStopAllSounds(reg_t obj, int16 value) {
#ifndef USE_OLD_MUSIC_FUNCTIONS
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();
for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
if (_soundVersion <= SCI_VERSION_0_LATE) {