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

vcmi: adjust parseBonus and Bonus::toJson

Browse Source 
This was an error, when scheme and parser asks different values for
source type. Corrected this.
This commit is contained in:
Konstantin
2023-02-13 11:52:11 +03:00
parent 129b5313c5
commit b99a2ad669
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/HeroBonus.cpp
View File

@ -1708,7 +1708,7 @@ JsonNode Bonus::toJsonNode() const
if(turnsRemain != 0) if(turnsRemain != 0)
root["turns"].Integer() = turnsRemain; root["turns"].Integer() = turnsRemain;
if(source != OTHER) if(source != OTHER)
root["source"].String() = vstd::findKey(bonusSourceMap, source); root["sourceType"].String() = vstd::findKey(bonusSourceMap, source);
if(sid != 0) if(sid != 0)
root["sourceID"].Integer() = sid; root["sourceID"].Integer() = sid;
if(val != 0) if(val != 0)

2
lib/JsonNode.cpp
View File

@ -845,7 +845,7 @@ bool JsonUtils::parseBonus(const JsonNode &ability, Bonus *b)
} }
} }
value = &ability["source"]; value = &ability["sourceType"];
if (!value->isNull()) if (!value->isNull())
b->source = static_cast<Bonus::BonusSource>(parseByMap(bonusSourceMap, value, "source type ")); b->source = static_cast<Bonus::BonusSource>(parseByMap(bonusSourceMap, value, "source type "));