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

[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:
cc1a570f96 AGOS: Revert my MIDI changes that caused bug #6664.


Commit: cc1a570f96660e40c653a569e298ea729703f09e
    https://github.com/scummvm/scummvm/commit/cc1a570f96660e40c653a569e298ea729703f09e
Author: Kirben (kirben at optusnet.com.au)
Date: 2014-06-29T23:36:11+10:00

Commit Message:
AGOS: Revert my MIDI changes that caused bug #6664.

Changed paths:
    engines/agos/midi.cpp



diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 392ee08..c26fbe3 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -235,10 +235,6 @@ 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;