[Scummvm-cvs-logs] scummvm master -> ac9182181d899d66ba6317e3e51dc781961ba239

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ac9182181d AGOS: Fix music looping when using Roland MT-32 music in Simon the Sorcerer 2.


Commit: ac9182181d899d66ba6317e3e51dc781961ba239
    https://github.com/scummvm/scummvm/commit/ac9182181d899d66ba6317e3e51dc781961ba239
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-04-13T19:51:33+10:00

Commit Message:
AGOS: Fix music looping when using Roland MT-32 music in Simon the Sorcerer 2.

Changed paths:
    engines/agos/midi.cpp



diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index c26fbe3..392ee08 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -235,6 +235,10 @@ void MidiPlayer::startTrack(int track) {
 		_music.parser = parser; // That plugs the power cord into the wall
 	} else if (_music.parser) {
 		if (!_music.parser->setTrack(track)) {
+			// The Roland MT32 music in Simon the Sorcerer 2
+			// is missing the extra tracks in many scenes,
+			// like the introduction sequence.
+			stop();
 			return;
 		}
 		_currentTrack = (byte)track;