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

Advance map header serialization

Browse Source
This commit is contained in:
AlexVinS
2016-02-21 20:58:09 +03:00
parent b6103167f7
commit 53b5587c2e
16 changed files with 230 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/serializer/JsonDeserializer.cpp
View File

@ -54,11 +54,33 @@ void JsonDeserializer::serializeLIC(const std::string & fieldName, const TDecode
if(field.isNull())
return;
auto loadPart = [&](const JsonVector & part, const bool val)
{
for(size_t index = 0; index < part.size(); index++)
{
const std::string & identifier = part[index].String();
logGlobal->debugStream() << "serializeLIC: " << fieldName << " " << identifier;
si32 rawId = decoder(identifier);
if(rawId >= 0)
{
if(rawId < value.size())
value[rawId] = val;
else
logGlobal->errorStream() << "JsonDeserializer::serializeLIC: " << fieldName <<" id out of bounds " << rawId;
}
else
{
logGlobal->errorStream() << "JsonDeserializer::serializeLIC: " << fieldName <<" identifier not resolved " << identifier;
}
}
};
const JsonVector & anyOf = field["anyOf"].Vector();
const JsonVector & allOf = field["allOf"].Vector();
const JsonVector & noneOf = field["noneOf"].Vector();
if(anyOf.empty() && allOf.empty())
{
//permissive mode
@ -70,35 +92,11 @@ void JsonDeserializer::serializeLIC(const std::string & fieldName, const TDecode
value.clear();
value.resize(standard.size(), false);
for(size_t index = 0; index < anyOf.size(); index++)
{
const std::string & identifier = anyOf[index].String();
si32 rawId = decoder(identifier);
if(rawId >= 0)
value[rawId] = true;
}
for(size_t index = 0; index < allOf.size(); index++)
{
const std::string & identifier = allOf[index].String();
si32 rawId = decoder(identifier);
if(rawId >=0)
value[rawId] = true;
}
}
for(size_t index = 0; index < noneOf.size(); index++)
{
const std::string & identifier = noneOf[index].String();
si32 rawId = decoder(identifier);
if(rawId >=0 )
value[rawId] = false;
loadPart(anyOf, true);
loadPart(allOf, true);
}
loadPart(noneOf, false);
}
void JsonDeserializer::serializeString(const std::string & fieldName, std::string & value)