games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge pull request #3105 from IvanSavenko/fix_conflicts

Browse Source 
Fix handling of conflicting mods by game client
This commit is contained in:
Ivan Savenko
2023-10-29 13:47:04 +02:00
committed by GitHub
parent 18b8971d6f c202f58a15
commit cc5bc40103
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/modding/CModHandler.cpp
View File

@@ -86,17 +86,28 @@ std::vector <TModID> CModHandler::validateAndSortDependencies(std::vector <TModI
std::set <TModID> resolvedModIDs; // Use a set for validation for performance reason, but set does not keep order of elements std::set <TModID> resolvedModIDs; // Use a set for validation for performance reason, but set does not keep order of elements
// Mod is resolved if it has not dependencies or all its dependencies are already resolved // Mod is resolved if it has not dependencies or all its dependencies are already resolved
auto isResolved = [&](const CModInfo & mod) -> CModInfo::EValidationStatus auto isResolved = [&](const CModInfo & mod) -> bool
{ {
if(mod.dependencies.size() > resolvedModIDs.size()) if(mod.dependencies.size() > resolvedModIDs.size())
return CModInfo::PENDING; return false;
for(const TModID & dependency : mod.dependencies) for(const TModID & dependency : mod.dependencies)
{ {
if(!vstd::contains(resolvedModIDs, dependency)) if(!vstd::contains(resolvedModIDs, dependency))
return CModInfo::PENDING; return false;
} }
return CModInfo::PASSED;
for(const TModID & conflict : mod.conflicts)
{
if(vstd::contains(resolvedModIDs, conflict))
return false;
}
for(const TModID & reverseConflict : resolvedModIDs)
{
if (vstd::contains(allMods.at(reverseConflict).conflicts, mod.identifier))
return false;
}
return true;
}; };
while(true) while(true)
@@ -104,7 +115,7 @@ std::vector <TModID> CModHandler::validateAndSortDependencies(std::vector <TModI
std::set <TModID> resolvedOnCurrentTreeLevel; std::set <TModID> resolvedOnCurrentTreeLevel;
for(auto it = modsToResolve.begin(); it != modsToResolve.end();) // One iteration - one level of mods tree for(auto it = modsToResolve.begin(); it != modsToResolve.end();) // One iteration - one level of mods tree
{ {
if(isResolved(allMods.at(*it)) == CModInfo::PASSED) if(isResolved(allMods.at(*it)))
{ {
resolvedOnCurrentTreeLevel.insert(*it); // Not to the resolvedModIDs, so current node childs will be resolved on the next iteration resolvedOnCurrentTreeLevel.insert(*it); // Not to the resolvedModIDs, so current node childs will be resolved on the next iteration
sortedValidMods.push_back(*it); sortedValidMods.push_back(*it);
@@ -131,6 +142,16 @@ std::vector <TModID> CModHandler::validateAndSortDependencies(std::vector <TModI
if(!vstd::contains(resolvedModIDs, dependency) && brokenMod.config["modType"].String() != "Compatibility") if(!vstd::contains(resolvedModIDs, dependency) && brokenMod.config["modType"].String() != "Compatibility")
logMod->error("Mod '%s' has been disabled: dependency '%s' is missing.", brokenMod.getVerificationInfo().name, dependency); logMod->error("Mod '%s' has been disabled: dependency '%s' is missing.", brokenMod.getVerificationInfo().name, dependency);
} }
for(const TModID & conflict : brokenMod.conflicts)
{
if(vstd::contains(resolvedModIDs, conflict))
logMod->error("Mod '%s' has been disabled: conflicts with enabled mod '%s'.", brokenMod.getVerificationInfo().name, conflict);
}
for(const TModID & reverseConflict : resolvedModIDs)
{
if (vstd::contains(allMods.at(reverseConflict).conflicts, brokenModID))
logMod->error("Mod '%s' has been disabled: conflicts with enabled mod '%s'.", brokenMod.getVerificationInfo().name, reverseConflict);
}
} }
return sortedValidMods; return sortedValidMods;
} }