aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichiesams2013-07-24 11:39:54 -0500
committerrichiesams2013-08-04 13:32:38 -0500
commit364e9d659cf62566611921c3b2abceb2d97e2632 (patch)
treee069690a163fce6e83285930d6aa841e5748a2ff
parent65a08c71c6912ec0bcf20987652f7bd5d50a7791 (diff)
downloadscummvm-rg350-364e9d659cf62566611921c3b2abceb2d97e2632.tar.gz
scummvm-rg350-364e9d659cf62566611921c3b2abceb2d97e2632.tar.bz2
scummvm-rg350-364e9d659cf62566611921c3b2abceb2d97e2632.zip
ZVISION: Force all files to be registered with SearchMan as 'flat'
There are 10 file name conflicts as a result, but the conflicts are byte identical.
-rw-r--r--engines/zvision/zvision.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 8cd7343368..b79ecb4993 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -56,11 +56,11 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
// However this is the place to specify all default directories
const Common::FSNode gameDataDir(ConfMan.get("path"));
- SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4);
- SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4);
- SearchMan.addSubDirectoryMatching(gameDataDir, "data3", 0, 4);
- SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx");
- SearchMan.addSubDirectoryMatching(gameDataDir, "znemscr");
+ // TODO: There are 10 file clashes when we flatten the directories. From a quick look, the files are exactly the same, so it shouldn't matter. But I'm noting it here just in-case it does become a problem.
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4, true);
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4, true);
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data3", 0, 4, true);
+ SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx", 0, 1, true);
// Here is the right place to set up the engine specific debug channels
//DebugMan.addDebugChannel(kZVisionDebugExample, "example", "this is just an example for a engine specific debug channel");