diff options
author | Martin Kiewitz | 2009-12-29 18:28:26 +0000 |
---|---|---|
committer | Martin Kiewitz | 2009-12-29 18:28:26 +0000 |
commit | ef0f48584729038189d8f31fd5a99f37f5a718e5 (patch) | |
tree | 50c6de647a554921d7aed309e40afa65111a4d8a /engines/sci/sfx/soundcmd.cpp | |
parent | 0fb1c8b1062bfa501a301dc56068099dd6c0a862 (diff) | |
download | scummvm-rg350-ef0f48584729038189d8f31fd5a99f37f5a718e5.tar.gz scummvm-rg350-ef0f48584729038189d8f31fd5a99f37f5a718e5.tar.bz2 scummvm-rg350-ef0f48584729038189d8f31fd5a99f37f5a718e5.zip |
SCI/newmusic: Removed playlist-feature from cmdResumeHandle cause that is sci0 only
svn-id: r46714
Diffstat (limited to 'engines/sci/sfx/soundcmd.cpp')
-rw-r--r-- | engines/sci/sfx/soundcmd.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sfx/soundcmd.cpp index abe7e7bb39..918b744c4e 100644 --- a/engines/sci/sfx/soundcmd.cpp +++ b/engines/sci/sfx/soundcmd.cpp @@ -565,29 +565,15 @@ void SoundCommandParser::cmdResumeHandle(reg_t obj, int16 value) { changeHandleStatus(obj, SOUND_STATUS_PLAYING); #else MusicEntry *musicSlot = NULL; - MusicList::iterator slotLoop = NULL; - if (!obj.segment) { - slotLoop = _music->enumPlayList(NULL); - musicSlot = *slotLoop; - } else { - musicSlot = _music->getSlot(obj); - if (!musicSlot) { - warning("cmdResumeHandle: Slot not found"); - return; - } + musicSlot = _music->getSlot(obj); + if (!musicSlot) { + warning("cmdResumeHandle: Slot not found"); + return; } - do { - PUT_SEL32V(_segMan, musicSlot->soundObj, state, kSoundPlaying); - _music->soundResume(musicSlot); - - if (slotLoop) { - slotLoop = _music->enumPlayList(slotLoop); - if (slotLoop) - musicSlot = *slotLoop; - } - } while (slotLoop); + PUT_SEL32V(_segMan, musicSlot->soundObj, state, kSoundPlaying); + _music->soundResume(musicSlot); #endif } |