mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-22 22:13:35 +02:00
Update lib/modding/ContentTypeHandler.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
This commit is contained in:
parent
3b72594743
commit
123f3923d3
@ -201,7 +201,8 @@ void ContentTypeHandler::afterLoadFinalization()
|
||||
for (auto const & conflictModEntry: conflictModData.Struct())
|
||||
conflictingMods.insert(conflictModEntry.first);
|
||||
|
||||
for (auto const & modID : conflictingMods) {
|
||||
for (auto const & modID : conflictingMods)
|
||||
{
|
||||
resolvedConflicts.merge(VLC->modh->getModDependencies(modID));
|
||||
resolvedConflicts.merge(VLC->modh->getModEnabledSoftDependencies(modID));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user