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

Fixed meta field handling in JsonUtils::inherit function, removed

Browse Source 
workarounds
This commit is contained in:
Ivan Savenko
2022-11-30 17:38:53 +02:00
parent 79c96e94fa
commit 5cd405bce8
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/CObjectClassesHandler.cpp
View File

@ -360,17 +360,9 @@ void CObjectClassesHandler::beforeValidate(JsonNode & object)
{
for (auto & entry : object["types"].Struct())
{
JsonNode base = object["base"];
base.setMeta(entry.second.meta);
JsonUtils::inherit(entry.second, base);
JsonUtils::inherit(entry.second, object["base"]);
for (auto & templ : entry.second["templates"].Struct())
{
JsonNode subBase = entry.second["base"];
subBase.setMeta(entry.second.meta);
JsonUtils::inherit(templ.second, subBase);
}
JsonUtils::inherit(templ.second, entry.second["base"]);
}
}