diff options
| author | Matthew Hoops | 2011-02-05 08:27:33 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2011-02-05 08:27:33 +0000 |
| commit | 0bf787736c7171b82b4c3eaf394cf720b8a7095f (patch) | |
| tree | 354e1dcbdf822c7f0fbe5bce70f3c4d3ed5bf997 /engines | |
| parent | 0a7887ac8af0b576c06959e1ed1d2a0acfcd3b99 (diff) | |
| download | scummvm-rg350-0bf787736c7171b82b4c3eaf394cf720b8a7095f.tar.gz scummvm-rg350-0bf787736c7171b82b4c3eaf394cf720b8a7095f.tar.bz2 scummvm-rg350-0bf787736c7171b82b4c3eaf394cf720b8a7095f.zip | |
SCI: Fix Mac SCI32 subdirectories
svn-id: r55783
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/resource.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 8cce04cb1f..cabf9f1717 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -679,14 +679,8 @@ int ResourceManager::addAppropriateSources() { Common::String filename = (*x)->getName(); addSource(new MacResourceForkResourceSource(filename, atoi(filename.c_str() + 4))); } -#ifdef ENABLE_SCI32 - // Mac SCI32 games have extra folders for patches - addPatchDir("Robot Folder"); - addPatchDir("Sound Folder"); - addPatchDir("Voices Folder"); - addPatchDir("Voices"); - //addPatchDir("VMD Folder"); +#ifdef ENABLE_SCI32 // There can also be a "Patches" resource fork with patches if (Common::File::exists("Patches")) addSource(new MacResourceForkResourceSource("Patches", 100)); diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index dc900e0800..978762968e 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -134,6 +134,11 @@ SciEngine::SciEngine(OSystem *syst, const ADGameDescription *desc, SciGameId gam SearchMan.addSubDirectoryMatching(gameDataDir, "movies"); // VMD movie files SearchMan.addSubDirectoryMatching(gameDataDir, "vmd"); // VMD movie files 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"); // Mac audio36 files + SearchMan.addSubDirectoryMatching(gameDataDir, "VMD Folder"); // Mac VMD files // Add the patches directory, except for KQ6CD; The patches folder in some versions of KQ6CD // is for the demo of Phantasmagoria, included in the disk |