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

tweaks

Browse Source
This commit is contained in:
AlexVinS 2016-02-10 13:24:03 +03:00
parent fb17914ae5
commit a307d3ca40
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/mapping/MapFormatJson.cpp
View File

@ -39,13 +39,26 @@ namespace TriggeredEventsDetail
static EventCondition JsonToCondition(const JsonNode & node)
{
//todo: support of new condition format
EventCondition event;
event.condition = EventCondition::EWinLoseType(vstd::find_pos(conditionNames, node.Vector()[0].String()));
const auto & conditionName = node.Vector()[0].String();
auto pos = vstd::find_pos(conditionNames, conditionName);
event.condition = EventCondition::EWinLoseType(pos));
if (node.Vector().size() > 1)
{
const JsonNode & data = node.Vector()[1];
if (data["type"].getType() == JsonNode::DATA_STRING)
event.objectType = VLC->modh->identifiers.getIdentifier(data["type"]).get();
{
auto identifier = VLC->modh->identifiers.getIdentifier(data["type"]);
if(identifier)
event.objectType = identifier.get();
else
throw std::runtime_error("Identifier resolution failed in event condition");
}
if (data["type"].getType() == JsonNode::DATA_FLOAT)
event.objectType = data["type"].Float();