diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-19 14:49:14 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-19 14:49:14 -0500 |
commit | 4280723f0ef24ff218cb81fd4ce8eb7abf063d34 (patch) | |
tree | 490c6f22a1311ea234d09949704c7ec1215731c7 /tools/mapjson/mapjson.cpp | |
parent | 57cf3a4bfb521e8a5ea4c85744b4789ea7d38215 (diff) | |
parent | 3e806419156cd1b57f8c6c1b215f836b467c723a (diff) |
Merge pull request #260 from GriffinRichards/doc-connection
Split connection field from graphics id in object events
Diffstat (limited to 'tools/mapjson/mapjson.cpp')
-rw-r--r-- | tools/mapjson/mapjson.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 753fac11b..563ed6352 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -274,6 +274,7 @@ string generate_firered_map_events_text(Json map_data) { auto obj_event = map_data["object_events"].array_items()[i]; text << "\tobject_event " << i + 1 << ", " << obj_event["graphics_id"].string_value() << ", " + << (obj_event["in_connection"].bool_value() ? 255 : 0) << ", " << obj_event["x"].int_value() << ", " << obj_event["y"].int_value() << ", " << obj_event["elevation"].int_value() << ", " |