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

* enum serialization/deserialization (si32 as basetype ought to be enough for anybody)

Browse Source 
* some fields in classes refactored to use appropriate enums (not yet finished)
This commit is contained in:
mateuszb
2013-02-01 22:04:25 +00:00
parent 096b0d6a36
commit c4e03ef0de
16 changed files with 135 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/JsonNode.cpp
View File

@ -989,7 +989,7 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
value = &ability["valueType"];
if (!value->isNull())
b->valType = parseByMap(bonusValueMap, value, "value type ");
b->valType = static_cast<Bonus::ValueType>(parseByMap(bonusValueMap, value, "value type "));
resolveIdentifier (b->additionalInfo, ability, "addInfo");
@ -1007,7 +1007,7 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
value = &ability["effectRange"];
if (!value->isNull())
b->effectRange = parseByMap(bonusLimitEffect, value, "effect range ");
b->effectRange = static_cast<Bonus::LimitEffect>(parseByMap(bonusLimitEffect, value, "effect range "));
value = &ability["duration"];
if (!value->isNull())
@ -1034,7 +1034,7 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
value = &ability["source"];
if (!value->isNull())
b->source = parseByMap(bonusSourceMap, value, "source type ");
b->source = static_cast<Bonus::BonusSource>(parseByMap(bonusSourceMap, value, "source type "));
value = &ability["limiters"];
if (!value->isNull())