games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Cleanup

Browse Source 
* simplify JSON values getting
* ensure initialization of Bonus fields
This commit is contained in:
alexvins
2013-03-14 17:21:16 +00:00
parent 9e7fe4d011
commit f686edc1b8
4 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/JsonNode.cpp
View File

@@ -965,9 +965,7 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
resolveIdentifier (b->subtype, ability, "subtype");
value = &ability["val"];
if (!value->isNull())
b->val = value->Float();
b->val = ability["val"].Float();
value = &ability["valueType"];
if (!value->isNull())
@@ -975,17 +973,11 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
resolveIdentifier (b->additionalInfo, ability, "addInfo");
value = &ability["turns"];
if (!value->isNull())
b->turnsRemain = value->Float();
b->turnsRemain = ability["turns"].Float();
value = &ability["sourceID"];
if (!value->isNull())
b->sid = value->Float();
b->sid = ability["sourceID"].Float();
value = &ability["description"];
if (!value->isNull())
b->description = value->String();
b->description = ability["description"].String();
value = &ability["effectRange"];
if (!value->isNull())