mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-26 06:40:22 +00:00
Merge branch 'list_resources' into 'master'
Minor optimisation in VFS::FileSystemArchive::listResources See merge request OpenMW/openmw!932
This commit is contained in:
commit
822e331f64
@ -40,16 +40,20 @@ namespace VFS
|
||||
|
||||
std::transform(proper.begin() + prefix, proper.end(), std::back_inserter(searchable), normalize_function);
|
||||
|
||||
if (!mIndex.insert (std::make_pair (searchable, file)).second)
|
||||
const auto inserted = mIndex.insert(std::make_pair(searchable, file));
|
||||
if (!inserted.second)
|
||||
Log(Debug::Warning) << "Warning: found duplicate file for '" << proper << "', please check your file system for two files with the same name in different cases.";
|
||||
else
|
||||
out[inserted.first->first] = &inserted.first->second;
|
||||
}
|
||||
|
||||
mBuiltIndex = true;
|
||||
}
|
||||
|
||||
for (index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
|
||||
else
|
||||
{
|
||||
out[it->first] = &it->second;
|
||||
for (index::iterator it = mIndex.begin(); it != mIndex.end(); ++it)
|
||||
{
|
||||
out[it->first] = &it->second;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user