[Scummvm-cvs-logs] scummvm master -> 4e852a691b180e4a3d87b46fb6a780e6e7866351

[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:
4e852a691b TINSEL: DW1: Improve timbre file error message


Commit: 4e852a691b180e4a3d87b46fb6a780e6e7866351
    https://github.com/scummvm/scummvm/commit/4e852a691b180e4a3d87b46fb6a780e6e7866351
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-10-24T20:25:48+02:00

Commit Message:
TINSEL: DW1: Improve timbre file error message

it now mentions all the possible file names.

Changed paths:
    engines/tinsel/music.cpp



diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 9b4e249..2a98042 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -418,9 +418,12 @@ MidiMusicPlayer::MidiMusicPlayer(TinselEngine *vm) {
 					// Version 2: drivers got installed and fat.opl got copied over by the user
 					_driver = Audio::MidiDriver_Miles_AdLib_create("MIDPAK.AD", "");
 				} else {
-					// Version 1: sample.ad / sample.opl, have to be copied over by the user for this version
-					// That's why we check those last, because then the user gets a proper error message for them
-					_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
+					if ((fileClass.exists("SAMPLE.AD")) || (fileClass.exists("SAMPLE.OPL"))) {
+						// Version 1: sample.ad / sample.opl, have to be copied over by the user for this version
+						_driver = Audio::MidiDriver_Miles_AdLib_create("SAMPLE.AD", "SAMPLE.OPL");
+					} else {
+						error("MILES-ADLIB: timbre file not found (may be called FAT.OPL, MIDPAK.AD, SAMPLE.AD or SAMPLE.OPL, may be in a subdirectory)");
+					}
 				}
 			}
 			break;