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

[refactor]

Browse Source 
+ crexp parser: parse mind immunity
This commit is contained in:
alexvins
2013-02-25 12:18:45 +00:00
parent 10fbe7b11e
commit 2cb86d84fa
5 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/JsonNode.cpp
View File

@ -885,6 +885,18 @@ JsonValidator::JsonValidator(JsonNode &root, const JsonNode &schema, bool Minimi
tlog3<<errors;
}
///JsonUtils
void JsonUtils::parseTypedBonusShort(const JsonVector& source, Bonus *dest)
{
dest->val = source[1].Float();
resolveIdentifier(source[2],dest->subtype);
dest->additionalInfo = source[3].Float();
dest->duration = Bonus::PERMANENT; //TODO: handle flags (as integer)
dest->turnsRemain = 0;
}
Bonus * JsonUtils::parseBonus (const JsonVector &ability_vec) //TODO: merge with AddAbility, create universal parser for all bonus properties
{
Bonus * b = new Bonus();
@ -892,15 +904,12 @@ Bonus * JsonUtils::parseBonus (const JsonVector &ability_vec) //TODO: merge with
auto it = bonusNameMap.find(type);
if (it == bonusNameMap.end())
{
tlog1 << "Error: invalid ability type " << type << " in creatures.txt" << std::endl;
tlog1 << "Error: invalid ability type " << type << std::endl;
return b;
}
b->type = it->second;
b->val = ability_vec[1].Float();
resolveIdentifier(ability_vec[2],b->subtype);
b->additionalInfo = ability_vec[3].Float();
b->duration = Bonus::PERMANENT; //TODO: handle flags (as integer)
b->turnsRemain = 0;
parseTypedBonusShort(ability_vec, b);
return b;
}
template <typename T>