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

Merge remote-tracking branch 'vcmi/beta' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-18 15:08:23 +03:00
parent f4c20bc33f 83b00bb7c3
commit d0b3319f6a
17 changed files with 185 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/modding/CModHandler.cpp
View File

@ -489,23 +489,49 @@ void CModHandler::afterLoad(bool onlyEssential)
}
void CModHandler::trySetActiveMods(const std::map<TModID, CModVersion> & modList)
void CModHandler::trySetActiveMods(std::vector<TModID> saveActiveMods, const std::map<TModID, CModVersion> & modList)
{
std::vector<TModID> newActiveMods;
ModIncompatibility::ModList missingMods;
for(const auto & mod : modList)
for(const auto & m : activeMods)
{
auto m = mod.first;
auto mver = mod.second;
if (vstd::contains(saveActiveMods, m))
continue;
if(allMods.count(m) && (allMods[m].version.isNull() || mver.isNull() || allMods[m].version.compatible(mver)))
allMods[m].setEnabled(true);
else
auto & modInfo = allMods.at(m);
if(modInfo.checkModGameplayAffecting())
missingMods.emplace_back(m, modInfo.version.toString());
}
for(const auto & m : saveActiveMods)
{
const CModVersion & mver = modList.at(m);
if (allMods.count(m) == 0)
{
missingMods.emplace_back(m, mver.toString());
continue;
}
auto & modInfo = allMods.at(m);
bool modAffectsGameplay = modInfo.checkModGameplayAffecting();
bool modVersionCompatible = modInfo.version.isNull() || mver.isNull() || modInfo.version.compatible(mver);
bool modEnabledLocally = vstd::contains(activeMods, m);
bool modCanBeEnabled = modEnabledLocally && modVersionCompatible;
allMods[m].setEnabled(modCanBeEnabled);
if (modCanBeEnabled)
newActiveMods.push_back(m);
if (!modCanBeEnabled && modAffectsGameplay)
missingMods.emplace_back(m, mver.toString());
}
if(!missingMods.empty())
throw ModIncompatibility(std::move(missingMods));
std::swap(activeMods, newActiveMods);
}
CIdentifierStorage & CModHandler::getIdentifiers()