libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 02:17:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add detection entry for KQ5 Mac. Also, make Mac and Amiga SCI1_EGA+ games default to MIDI as we don't (yet) support their patches. KQ5 Mac will start and go until the main menu.

Browse Source 
svn-id: r47924
This commit is contained in:
Matthew Hoops 2010-02-06 01:38:00 +00:00
parent c7cbb80dc4
commit f1f277d56d
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/sci/detection_tables.h
View File

@ -1009,6 +1009,21 @@ static const struct ADGameDescription SciGameDescriptions[] = {
{NULL, 0, NULL, 0}},
Common::PL_POL, Common::kPlatformPC, 0, GUIO_NOSPEECH },
// King's Quest 5 - English Macintosh
// VERSION file reports "1.000.055"
{"kq5", "", {
{"resource.map", 0, "4d4bd26ac9f3014f5dae6b21cdcde747", 8598},
{"resource.000", 0, "e8965601526ce840887b8af3a8593156", 328291},
{"resource.001", 0, "aa2fae60f67edf2aacd43b92b59c2b3d", 1071492},
{"resource.002", 0, "14311ed6d0f4ae0af7561470953cc466", 1373044},
{"resource.003", 0, "aa606e541901b1dd150b49014ace6d11", 1401126},
{"resource.004", 0, "bb81f49927cdb0ac4d902e64f2bc40ec", 1377139},
{"resource.005", 0, "432e2a58e4d496d730697db072437337", 1366732},
{"resource.006", 0, "3d22904a374c192f51e5665b74364133", 1264079},
{"resource.007", 0, "ffe17e23d5833a79f3695addfc149a56", 1361965},
{NULL, 0, NULL, 0}},
Common::EN_ANY, Common::kPlatformMacintosh, 0, GUIO_NOSPEECH },
// King's Quest 6 - English DOS Non-Interactive Demo
// Executable scanning reports "1.001.055", VERSION file reports "1.000.000"
// SCI interpreter version 1.001.055

10
engines/sci/sound/music.cpp
View File

@ -63,11 +63,15 @@ void SciMusic::init() {
MidiDriverType midiType;
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2)
// Default to MIDI in SCI32 games, as many don't have AdLib support.
// WORKAROUND: Default to MIDI in Amiga SCI1_EGA+ games as we don't support those patches yet.
// We also don't yet support the 7.pat file of SCI1+ Mac games or SCI0 Mac patches, so we
// default to MIDI in those games to let them run.
Common::Platform platform = ((SciEngine *)g_engine)->getPlatform();
if (getSciVersion() >= SCI_VERSION_2 || platform == Common::kPlatformMacintosh || (platform == Common::kPlatformAmiga && getSciVersion() >= SCI_VERSION_1_EGA))
midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
else
#endif
midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI);
switch (midiType) {