[Scummvm-cvs-logs] scummvm master -> 60903c29083b17441dec000669d11c69c6553e6c

[m-kiewitz]

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:
60903c2908 TINSEL: DW1: MT32: don't pass timbre file


Commit: 60903c29083b17441dec000669d11c69c6553e6c
    https://github.com/scummvm/scummvm/commit/60903c29083b17441dec000669d11c69c6553e6c
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-28T12:49:12+02:00

Commit Message:
TINSEL: DW1: MT32: don't pass timbre file

because the game does not have one

Changed paths:
    engines/tinsel/music.cpp



diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 354fce1..74e28c3 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -392,11 +392,12 @@ MidiMusicPlayer::MidiMusicPlayer(TinselEngine *vm) {
 			_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
 			break;
 		case MT_MT32:
-			_driver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
+			// Discworld 1 doesn't have a MT32 timbre file
+			_driver = Audio::MidiDriver_Miles_MT32_create("");
 			break;
 		case MT_GM:
 			if (ConfMan.getBool("native_mt32")) {
-				_driver = Audio::MidiDriver_Miles_MT32_create("SAMPLE.MT");
+				_driver = Audio::MidiDriver_Miles_MT32_create("");
 				musicType = MT_MT32;
 			}
 			break;