From 2a2db28e57e78eb8861997422f998378d91bf9dc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 18:13:31 -0500 Subject: Split connection field from graphics id in object events --- tools/mapjson/mapjson.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/mapjson/mapjson.cpp') diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 753fac11b..cce690662 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"].int_value() << ", " << obj_event["x"].int_value() << ", " << obj_event["y"].int_value() << ", " << obj_event["elevation"].int_value() << ", " -- cgit v1.2.3 From 3e806419156cd1b57f8c6c1b215f836b467c723a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 19:52:37 -0500 Subject: in_connection to bool --- tools/mapjson/mapjson.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/mapjson/mapjson.cpp') diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index cce690662..563ed6352 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -274,7 +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"].int_value() << ", " + << (obj_event["in_connection"].bool_value() ? 255 : 0) << ", " << obj_event["x"].int_value() << ", " << obj_event["y"].int_value() << ", " << obj_event["elevation"].int_value() << ", " -- cgit v1.2.3