sera/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix 498f0d420b - re-add special-casing of mod & user mods

Browse Source 
These do not have a mod.json, triggering spurious errors.

This was SVN commit r25548.
This commit is contained in:
wraitii 2021-05-25 07:50:04 +00:00
parent 863ef0f88a
commit 424b3cdcab
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/ps/Mod.cpp
View File

@ -216,7 +216,7 @@ std::vector<CStr> Mod::CheckForIncompatibleMods(const std::vector<CStr>& mods) c
std::unordered_map<CStr, CStr> modNameVersions;
for (const CStr& mod : mods)
{
if (mod == "mod")
if (mod == "mod" || mod == "user")
continue;
std::vector<ModData>::const_iterator it = std::find_if(m_AvailableMods.begin(), m_AvailableMods.end(),
@ -235,7 +235,7 @@ std::vector<CStr> Mod::CheckForIncompatibleMods(const std::vector<CStr>& mods) c
static const std::vector<CStr> toCheck = { "<=", ">=", "=", "<", ">" };
for (const CStr& mod : mods)
{
if (mod == "mod")
if (mod == "mod" || mod == "user")
continue;
const std::unordered_map<CStr, std::vector<CStr>>::iterator res = modDependencies.find(mod);
@ -318,6 +318,9 @@ JS::Value Mod::GetLoadedModsWithVersions(const ScriptInterface& scriptInterface)
std::vector<std::vector<CStr>> loadedMods;
for (const CStr& mod : m_EnabledMods)
{
if (mod == "mod" || mod == "user")
continue;
std::vector<ModData>::const_iterator it = std::find_if(m_AvailableMods.begin(), m_AvailableMods.end(),
[&mod](const ModData& modData) { return modData.m_Pathname == mod; });