From 75b9950ec7620d982b9271f10134d984b17f1c45 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 22 Nov 2022 10:40:26 -0500 Subject: [PATCH] Allow object type field to be missing --- tools/mapjson/mapjson.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 0060920a8..5de9f7461 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -289,7 +289,9 @@ string generate_firered_map_events_text(Json map_data) { for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; string type = obj_event["type"].string_value(); - if (type == "object") { + + // If no type field is present, assume it's a regular object event. + if (type == "" || type == "object") { text << "\tobject_event " << i + 1 << ", " << obj_event["graphics_id"].string_value() << ", " << obj_event["x"].int_value() << ", "