From ef0f48584729038189d8f31fd5a99f37f5a718e5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Tue, 29 Dec 2009 18:28:26 +0000
Subject: SCI/newmusic: Removed playlist-feature from cmdResumeHandle cause
 that is sci0 only

svn-id: r46714
---
 engines/sci/sfx/soundcmd.cpp | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'engines/sci')

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
 }
 
-- 
cgit v1.2.3