Ticket #8651: adlib-fallback4.diff

engines/scumm/scumm.cpp

@@ -1553 +1553 @@
                 _musicType = MDT_MIDI;
                 break;
         }
+
+        if ((_game.id == GID_MONKEY_EGA || (_game.id == GID_LOOM && _game.version == 3))
+           &&  (_game.platform == Common::kPlatformPC) && _musicType == MDT_MIDI) {
+                Common::String fileName;
+                bool missingFile = false;
+                if (_game.id == GID_LOOM) {
+                        Common::File f;
+                        // The Roland Update does have an 85.LFL, but we don't
+                        // test for it since the demo doesn't have it.
+                        for (char c = '2'; c <= '4'; c++) {
+                                fileName = "8";
+                                fileName += c;
+                                fileName += ".LFL";
+                                if (!Common::File::exists(fileName)) {
+                                        missingFile = true;
+                                        break;
+                                }
+                        }
+                } else if (_game.id == GID_MONKEY_EGA) {
+                        fileName = "DISK09.LEC";
+                        if (!Common::File::exists(fileName)) {
+                                missingFile = true;
+                        }
+                }
+
+                if (missingFile) {
+                        GUI::MessageDialog dialog(
+                                "Native MIDI support requires the Roland Upgrade from LucasArts,\n"
+                                "but " + fileName + " is missing. Using Adlib instead.", "Ok");
+                        dialog.runModal();
+                        _musicType = MDT_ADLIB;
+                }
+        }
         
         // DOTT + SAM use General MIDI, so they shouldn't use GS settings
         if ((_game.id == GID_TENTACLE) || (_game.id == GID_SAMNMAX))

engines/scumm/vars.cpp

@@ -707 +707 @@
                 default:
                         if ((_game.id == GID_MONKEY_EGA || _game.id == GID_MONKEY_VGA || (_game.id == GID_LOOM && _game.version == 3))
                            &&  (_game.platform == Common::kPlatformPC)) {
-                                if (_game.id == GID_LOOM) {
-                                        char buf[50];
-                                        Common::File f;
-                                        for (int i = 82; i < 85; i++) {
-                                                sprintf(buf, "%d.LFL", i);
-                                                if (!Common::File::exists(buf)) {
-                                                        // TODO: Instead of a hard error, try to fall back to adlib?
-                                                        error("Native MIDI support requires Roland patch from LucasArts, but %s is missing", buf);
-                                                }
-                                        }
-                                } else if (_game.id == GID_MONKEY_EGA) {
-                                        if (!Common::File::exists("DISK09.LEC")) {
-                                                // TODO: Instead of a hard error, try to fall back to adlib?
-                                                error("Native MIDI support requires Roland patch from LucasArts, but DISK09.LEC is missing");
-                                        }
-                                }
                                 VAR(VAR_SOUNDCARD) = 4;
                         } else {
                                 VAR(VAR_SOUNDCARD) = 3;
                         }
+                        break;
                 }
 
                 if (_game.platform == Common::kPlatformFMTowns)