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

Implemented inheritance semantic for spell level configuration.

Browse Source 
This allows more simplification.
This commit is contained in:
AlexVinS
2014-05-18 20:27:12 +04:00
parent b4e702a1d2
commit 2fc16b231f
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CSpellHandler.cpp
View File

@ -868,17 +868,23 @@ void CSpellHandler::beforeValidate(JsonNode & object)
{
//handle "base" level info
JsonNode levels = object["levels"];
if(levels["base"].getType() == JsonNode::DATA_STRUCT)
{
JsonUtils::mergeCopy(levels["none"],levels["base"]);
JsonUtils::mergeCopy(levels["basic"],levels["base"]);
JsonUtils::mergeCopy(levels["advanced"],levels["base"]);
JsonUtils::mergeCopy(levels["expert"],levels["base"]);
}
JsonNode& levels = object["levels"];
JsonNode& base = levels["base"];
auto inheritNode = [&](JsonNode & dest){
//merging destination node into copy of base node implements inheritance semantic
//detail configuration is priority
//this allows more simplification
JsonNode inheritedNode(base);
JsonUtils::merge(inheritedNode,dest);
dest.swap(inheritedNode);
};
inheritNode(levels["none"]);
inheritNode(levels["basic"]);
inheritNode(levels["advanced"]);
inheritNode(levels["expert"]);
}