[Scummvm-cvs-logs] SF.net SVN: scummvm:[55783] scummvm/trunk/engines/sci
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Sat Feb 5 09:27:34 CET 2011
Revision: 55783
http://scummvm.svn.sourceforge.net/scummvm/?rev=55783&view=rev
Author: mthreepwood
Date: 2011-02-05 08:27:33 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
SCI: Fix Mac SCI32 subdirectories
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.cpp
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2011-02-05 08:20:06 UTC (rev 55782)
+++ scummvm/trunk/engines/sci/resource.cpp 2011-02-05 08:27:33 UTC (rev 55783)
@@ -679,14 +679,8 @@
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));
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2011-02-05 08:20:06 UTC (rev 55782)
+++ scummvm/trunk/engines/sci/sci.cpp 2011-02-05 08:27:33 UTC (rev 55783)
@@ -134,6 +134,11 @@
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list