1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00

Respect dependencies when checking for filesystem conflicts

This commit is contained in:
Ivan Savenko 2024-10-06 17:20:58 +00:00
parent d849e53499
commit 3e3f842fbe

View File

@ -346,6 +346,9 @@ void CModHandler::loadModFilesystems()
if (leftModName == rightModName)
continue;
if (getModDependencies(leftModName).count(rightModName) || getModDependencies(rightModName).count(leftModName))
continue;
const auto & filter = [](const ResourcePath &path){return path.getType() != EResType::DIRECTORY;};
std::unordered_set<ResourcePath> leftResources = modFilesystems[leftModName]->getFilteredFiles(filter);