1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

- added default values to JsonNode

- small cleanup to heroes.json
This commit is contained in:
Ivan Savenko
2011-08-27 21:17:45 +00:00
parent f3b6ecf9a3
commit 33719696d8
7 changed files with 487 additions and 501 deletions

View File

@@ -125,32 +125,42 @@ JsonMap & JsonNode::Struct()
}
const bool & JsonNode::Bool() const
const bool & JsonNode::Bool(const bool &value) const
{
if (isNull())
return value;
assert(type == DATA_BOOL);
return data.Bool;
}
const float & JsonNode::Float() const
const float & JsonNode::Float(const float &value) const
{
if (isNull())
return value;
assert(type == DATA_FLOAT);
return data.Float;
}
const std::string & JsonNode::String() const
const std::string & JsonNode::String(const std::string &value) const
{
if (isNull())
return value;
assert(type == DATA_STRING);
return *data.String;
}
const JsonVector & JsonNode::Vector() const
const JsonVector & JsonNode::Vector(const JsonVector &value) const
{
if (isNull())
return value;
assert(type == DATA_VECTOR);
return *data.Vector;
}
const JsonMap & JsonNode::Struct() const
const JsonMap & JsonNode::Struct(const JsonMap &value) const
{
if (isNull())
return value;
assert(type == DATA_STRUCT);
return *data.Struct;
}