diff options
| -rw-r--r-- | engines/sci/detection_tables.h | 12 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 05af2ff78c..bdba75dfa5 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -4005,6 +4005,18 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"ressci.000", 0, "118f9bec04bfe17c4f87bbb5ddb43c18", 56126981}, AD_LISTEND}, Common::FR_FRA, Common::kPlatformWindows, ADGF_UNSTABLE, GUIO4(GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + + // Torin's Passage - English Macintosh + {"torin", "", { + {"Data1", 0, "63887e33cc282c92dc1f916f54aea8eb", 700786}, + {"Data2", 0, "da2f13be2819a7333fee372d38b8d1a2", 122485}, + {"Data3", 0, "e9fda4f1714ddb443545ba8a2d58ef18", 7299126}, + {"Data4", 0, "59b432ec35b24a216432a556e25087ef", 7209309}, + {"Data5", 0, "189e809f24aee83c707dea03a543c7c4", 6615563}, + {"Data6", 0, "b639487c83d1dae0e001e700f3631566", 7594881}, + {"Data7", 0, "2afd9b5434102b89610916b904c3f73a", 7627374}, + AD_LISTEND}, + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK | ADGF_UNSTABLE, GUIO4(GUIO_NOASPECT, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, #endif // ENABLE_SCI32 // SCI Fanmade Games diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index e4b3028bcd..79ab2d138b 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -185,7 +185,8 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) { hotspot = new Common::Point(argv[3].toSint16(), argv[4].toSint16()); // Fallthrough case 3: - if (g_sci->getPlatform() == Common::kPlatformMacintosh) { + if (g_sci->getPlatform() == Common::kPlatformMacintosh && g_sci->getGameId() != GID_TORIN) { + // Torin Mac seems to be the only game that uses view cursors delete hotspot; // Mac cursors have their own hotspot, so ignore any we get here g_sci->_gfxCursor->kernelSetMacCursor(argv[0].toUint16(), argv[1].toUint16(), argv[2].toUint16()); } else { diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index ae1d3ebdc5..ff804af4b4 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -137,7 +137,7 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam SearchMan.addSubDirectoryMatching(gameDataDir, "duk"); // Duck movie files in Phantasmagoria 2 SearchMan.addSubDirectoryMatching(gameDataDir, "Robot Folder"); // Mac robot files SearchMan.addSubDirectoryMatching(gameDataDir, "Sound Folder"); // Mac audio files - SearchMan.addSubDirectoryMatching(gameDataDir, "Voices Folder"); // Mac audio36 files + SearchMan.addSubDirectoryMatching(gameDataDir, "Voices Folder", 0, 2, true); // Mac audio36 files (recursive for Torin) SearchMan.addSubDirectoryMatching(gameDataDir, "Voices"); // Mac audio36 files SearchMan.addSubDirectoryMatching(gameDataDir, "VMD Folder"); // Mac VMD files |