games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

Update lib/modding/ContentTypeHandler.cpp

Browse Source 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
This commit is contained in:
kdmcser 2024-10-29 00:35:03 +08:00 committed by GitHub
parent 3b72594743
commit 123f3923d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/modding/ContentTypeHandler.cpp
View File

@ -201,7 +201,8 @@ void ContentTypeHandler::afterLoadFinalization()
for (auto const & conflictModEntry: conflictModData.Struct()) for (auto const & conflictModEntry: conflictModData.Struct())
conflictingMods.insert(conflictModEntry.first); conflictingMods.insert(conflictModEntry.first);
for (auto const & modID : conflictingMods) { for (auto const & modID : conflictingMods)
{
resolvedConflicts.merge(VLC->modh->getModDependencies(modID)); resolvedConflicts.merge(VLC->modh->getModDependencies(modID));
resolvedConflicts.merge(VLC->modh->getModEnabledSoftDependencies(modID)); resolvedConflicts.merge(VLC->modh->getModEnabledSoftDependencies(modID));
} }