games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge branch 'vcmi/beta' into 'vcmi/develop'

Browse Source
This commit is contained in:
Ivan Savenko
2024-06-21 12:58:36 +00:00
parent c8aeee764b c328007687
commit 3bea383b59
69 changed files with 735 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/modding/CModHandler.cpp
View File

@@ -227,10 +227,7 @@ void CModHandler::loadOneMod(std::string modName, const std::string & parent, co
if(CResourceHandler::get("initial")->existsResource(CModInfo::getModFile(modFullName)))
{
JsonParsingSettings settings;
settings.mode = JsonParsingSettings::JsonFormatMode::JSON; // TODO: remove once Android launcher with its strict parser is gone
CModInfo mod(modFullName, modSettings[modName], JsonNode(CModInfo::getModFile(modFullName), settings));
CModInfo mod(modFullName, modSettings[modName], JsonNode(CModInfo::getModFile(modFullName)));
if (!parent.empty()) // this is submod, add parent to dependencies
mod.dependencies.insert(parent);