From a31de2adfa6818da700f82657dec6b79df9638c9 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Mon, 10 May 2010 20:32:55 +0000
Subject: SCI: set signal to SIGNAL_OFFSET, when a music slot is played that
 doesn't contain supported data - fixes lsl5 mud wrestling "regression" in new
 music/sound code (worked before with old music/sound engine)

svn-id: r49000
---
 engines/sci/sound/soundcmd.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 48b65c2810..2a9842f70b 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -833,7 +833,7 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
 			_music->soundSetVolume(musicSlot, musicSlot->volume);
 			musicSlot->fadeSetVolume = false;
 		}
-	} else {
+	} else if (musicSlot->pMidiParser) {
 		// Update MIDI slots
 		if (musicSlot->signal == 0) {
 			if (musicSlot->dataInc != GET_SEL32V(_segMan, obj, SELECTOR(dataInc))) {
@@ -848,6 +848,11 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) {
 			if (musicSlot->signal == SIGNAL_OFFSET)
 				cmdStopSound(obj, 0);
 		}
+	} else {
+		// Slot actually has no data (which would mean that a sound-resource w/ unsupported data is used
+		//  (example lsl5 - sound resource 744 - it's roland exclusive
+		PUT_SEL32V(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
+		// If we don't set signal here, at least the switch to the mud wrestling room in lsl5 will not work
 	}
 
 	if (musicSlot->fadeCompleted) {
-- 
cgit v1.2.3