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

Spell configuration: introduce simplifaction mechanism for level conficuration

Browse Source 
* also aviable for other handlers
This commit is contained in:
AlexVinS
2014-05-18 18:47:18 +04:00
parent 950ca1156a
commit f2b61f7e69
5 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CModHandler.cpp
View File

@@ -296,6 +296,12 @@ bool CContentHandler::ContentTypeHandler::loadMod(std::string modName, bool vali
{
ModInfo & modInfo = modData[modName];
bool result = true;
auto performValidate = [&,this](JsonNode & data, const std::string & name){
handler->beforeValidate(data);
if (validate)
result &= JsonUtils::validate(data, "vcmi:" + objectName, name);
};
// apply patches
if (!modInfo.patches.isNull())
@@ -314,8 +320,8 @@ bool CContentHandler::ContentTypeHandler::loadMod(std::string modName, bool vali
if (originalData.size() > index)
{
JsonUtils::merge(originalData[index], data);
if (validate)
result &= JsonUtils::validate(originalData[index], "vcmi:" + objectName, name);
performValidate(originalData[index],name);
handler->loadObject(modName, name, originalData[index], index);
originalData[index].clear(); // do not use same data twice (same ID)
@@ -324,8 +330,7 @@ bool CContentHandler::ContentTypeHandler::loadMod(std::string modName, bool vali
}
}
// normal new object or one with index bigger that data size
if (validate)
result &= JsonUtils::validate(data, "vcmi:" + objectName, name);
performValidate(data,name);
handler->loadObject(modName, name, data);
}
return result;