dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow object type field to be missing

Browse Source
This commit is contained in:
GriffinR
2022-11-22 10:40:26 -05:00
parent e104c35436
commit 75b9950ec7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mapjson/mapjson.cpp
+3 -1
View File
@@ -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++) { for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) {
auto obj_event = map_data["object_events"].array_items()[i]; auto obj_event = map_data["object_events"].array_items()[i];
string type = obj_event["type"].string_value(); 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 << ", " text << "\tobject_event " << i + 1 << ", "
<< obj_event["graphics_id"].string_value() << ", " << obj_event["graphics_id"].string_value() << ", "
<< obj_event["x"].int_value() << ", " << obj_event["x"].int_value() << ", "