1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:53:50 +00:00

Archive priority fix

This commit is contained in:
scrawl 2015-03-30 17:11:15 +02:00
parent 34934f016a
commit a474c72026

View file

@ -11,13 +11,6 @@ namespace VFS
{ {
const Files::PathContainer& dataDirs = collections.getPaths(); const Files::PathContainer& dataDirs = collections.getPaths();
if (useLooseFiles)
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
{
// Last data dir has the highest priority
vfs->addArchive(new FileSystemArchive(iter->string()));
}
for (std::vector<std::string>::const_iterator archive = archives.begin(); archive != archives.end(); ++archive) for (std::vector<std::string>::const_iterator archive = archives.begin(); archive != archives.end(); ++archive)
{ {
if (collections.doesExist(*archive)) if (collections.doesExist(*archive))
@ -36,6 +29,13 @@ namespace VFS
} }
} }
if (useLooseFiles)
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
{
// Last data dir has the highest priority
vfs->addArchive(new FileSystemArchive(iter->string()));
}
vfs->buildIndex(); vfs->buildIndex();
} }