thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Add ignoreClashes flag to SearchSet and FSDirectory

Browse source 
This lets engine mute warnings about name clashes when there are useless
for its case. This will be used by Versailles as the tree has
directories with the same name at various places.
Files are duplicated too in different directories but are identical.
This commit is contained in:
Le Philousophe 2019-10-20 17:37:18 +02:00 • committed by Eugene Sandulenko
parent b6132fec03
commit d62bb15d71
4 changed files with 57 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/archive.cpp
View file

@ -115,7 +115,7 @@ void SearchSet::addDirectory(const String &name, const FSNode &dir, int priority
if (!dir.exists() || !dir.isDirectory())
return;
add(name, new FSDirectory(dir, depth, flat), priority);
add(name, new FSDirectory(dir, depth, flat, _ignoreClashes), priority);
}
void SearchSet::addSubDirectoriesMatching(const FSNode &directory, String origPattern, bool ignoreCase, int priority, int depth, bool flat) {