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

replaced JsonNode::isEmpty() with JsonNode::containsBaseData()

Browse Source
This commit is contained in:
Henning Koehler 2017-09-16 10:23:31 +12:00
parent 6414cd18e8
commit ee46862784
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CHeroHandler.cpp
View File

@ -840,7 +840,7 @@ void CHeroHandler::afterLoadFinalization()
if(specVec.size() > 1)
{
JsonNode base = JsonUtils::intersect(specVec);
if(!base.isEmpty())
if(base.containsBaseData())
{
specNode["base"] = base;
for(JsonNode & node : specVec)

24
lib/JsonNode.cpp
View File

@ -214,21 +214,22 @@ bool JsonNode::isNumber() const
return type == JsonType::DATA_INTEGER || type == JsonType::DATA_FLOAT;
}
bool JsonNode::isEmpty() const
bool JsonNode::containsBaseData() const
{
switch(type)
{
case JsonType::DATA_NULL:
return true;
return false;
case JsonType::DATA_STRUCT:
for(auto elem : *data.Struct)
{
if(!elem.second.isEmpty())
return false;
if(elem.second.containsBaseData())
return true;
}
return true;
default:
return false;
default:
//other types (including vector) cannot be extended via merge
return true;
}
}
@ -908,7 +909,7 @@ JsonNode JsonUtils::intersect(const JsonNode & a, const JsonNode & b, bool prune
if(vstd::contains(b.Struct(), property.first))
{
JsonNode propertyIntersect = JsonUtils::intersect(property.second, b.Struct().find(property.first)->second);
if(pruneEmpty && propertyIntersect.isEmpty())
if(pruneEmpty && !propertyIntersect.containsBaseData())
continue;
result[property.first] = propertyIntersect;
}
@ -934,16 +935,17 @@ JsonNode JsonUtils::difference(const JsonNode & node, const JsonNode & base)
{
if(vstd::contains(base.Struct(), property.first))
{
JsonNode propertyDifference = JsonUtils::difference(property.second, base.Struct().find(property.first)->second);
if(propertyDifference.isEmpty())
continue;
result[property.first] = propertyDifference;
const JsonNode propertyDifference = JsonUtils::difference(property.second, base.Struct().find(property.first)->second);
if(!propertyDifference.isNull())
result[property.first] = propertyDifference;
}
else
{
result[property.first] = property.second;
}
}
if(result.Struct().empty())
return nullNode;
return result;
}
else

4
lib/JsonNode.h
View File

@ -75,7 +75,9 @@ public:
bool isNull() const;
bool isNumber() const;
bool isEmpty() const;
/// true if node contains not-null data that cannot be extended via merging
/// used for generating common base node from multiple nodes (e.g. bonuses)
bool containsBaseData() const;
bool isCompact() const;
/// removes all data from node and sets type to null
void clear();