TINSEL: Change SetMidiVolume() so that it doesn't start/stop music tracks

Previously, SetMidiVolume() would stop the currently playing track when
the MIDI volume was set to 0. Now, the music track always plays, even
when the volume is set to 0. This fixes bug #3541533 - "DW: Silencing
music volume stops music" and resolves two FIXME comments

1 files changed, 6 insertions, 15 deletions

diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 7c4fec6592..058f8eb6fd 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -1625,10 +1625,6 @@ static void Play(CORO_PARAM, SCNHANDLE hFilm, int x, int y, bool bComplete, int
  * Play a midi file.
  */
 static void PlayMidi(CORO_PARAM, SCNHANDLE hMidi, int loop, bool complete) {
-	// FIXME: This is a workaround for the FIXME below
-	if (GetMidiVolume() == 0)
-		return;
-
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);
 
@@ -1637,18 +1633,13 @@ static void PlayMidi(CORO_PARAM, SCNHANDLE hMidi, int loop, bool complete) {
 
 	PlayMidiSequence(hMidi, loop == MIDI_LOOP);
 
-	// FIXME: The following check messes up the script arguments when
-	// entering the secret door in the bookshelf in the library,
-	// leading to a crash, when the music volume is set to 0 (MidiPlaying()
-	// always false then).
-	//
-	// Why exactly this happens is unclear. An analysis of the involved
-	// script(s) might reveal more.
-	//
-	// Note: This check&sleep was added in DW v2. It was most likely added
-	// to ensure that the MIDI song started playing before the next opcode
+	// This check&sleep was added in DW v2. It was most likely added to
+	// ensure that the MIDI song started playing before the next opcode
 	// is executed.
-	if (!MidiPlaying())
+	// In DW1, it messes up the script arguments when entering the secret
+	// door in the bookshelf in the library, leading to a crash, when the
+	// music volume is set to 0.
+	if (!MidiPlaying() && TinselV2)
 		CORO_SLEEP(1);
 
 	if (complete) {