aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorMartin Kiewitz2015-10-24 20:25:48 +0200
committerMartin Kiewitz2015-10-24 20:25:48 +0200
commit4e852a691b180e4a3d87b46fb6a780e6e7866351 (patch)
tree8a34e19a81898cb45dfb737f32334095db125b20 /engines/tinsel
parent4a38e2618dc94df70342db7a25c0d6f87267984e (diff)
downloadscummvm-rg350-4e852a691b180e4a3d87b46fb6a780e6e7866351.tar.gz
scummvm-rg350-4e852a691b180e4a3d87b46fb6a780e6e7866351.tar.bz2
scummvm-rg350-4e852a691b180e4a3d87b46fb6a780e6e7866351.zip
TINSEL: DW1: Improve timbre file error message
it now mentions all the possible file names.
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/music.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 9b4e2494e0..2a9804263a 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;