From 2da8e18200b4ce8971a1c93e3fa1eb8da8c30082 Mon Sep 17 00:00:00 2001 From: Ted John Date: Tue, 11 Dec 2018 23:00:59 +0000 Subject: [PATCH] Read the canGrow flag from surface objects --- src/openrct2/object/TerrainSurfaceObject.cpp | 3 ++- src/openrct2/object/TerrainSurfaceObject.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp index a71ccba970..a5dec79c7e 100644 --- a/src/openrct2/object/TerrainSurfaceObject.cpp +++ b/src/openrct2/object/TerrainSurfaceObject.cpp @@ -81,7 +81,8 @@ void TerrainSurfaceObject::ReadJson(IReadObjectContext* context, const json_t* r Flags = ObjectJsonHelpers::GetFlags( properties, { { "smoothWithSelf", TERRAIN_SURFACE_FLAGS::SMOOTH_WITH_SELF }, - { "smoothWithOther", TERRAIN_SURFACE_FLAGS::SMOOTH_WITH_OTHER } }); + { "smoothWithOther", TERRAIN_SURFACE_FLAGS::SMOOTH_WITH_OTHER }, + { "canGrow", TERRAIN_SURFACE_FLAGS::CAN_GROW } }); auto jDefault = json_object_get(root, "default"); if (json_is_object(jDefault)) diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h index cfe05c0f73..71f2fff106 100644 --- a/src/openrct2/object/TerrainSurfaceObject.h +++ b/src/openrct2/object/TerrainSurfaceObject.h @@ -17,6 +17,7 @@ enum TERRAIN_SURFACE_FLAGS NONE = 0, SMOOTH_WITH_SELF = 1 << 0, SMOOTH_WITH_OTHER = 1 << 1, + CAN_GROW = 1 << 2, }; class TerrainSurfaceObject final : public Object