From ef6768dd33af3fcc696e28395bb463ecdcae1dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com> Date: Wed, 8 Sep 2021 19:18:24 +0300 Subject: [PATCH] Segment the object arrays in rct_s6_data --- src/openrct2/rct2/RCT2.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 84218c1cf5..73cffc8e7f 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -836,7 +836,24 @@ struct rct_s6_data // packed objects // SC6[3] - rct_object_entry objects[RCT2_OBJECT_ENTRY_COUNT]; + union + { + rct_object_entry objects[RCT2_OBJECT_ENTRY_COUNT]; + struct + { + rct_object_entry rideObjects[RCT12_MAX_RIDE_OBJECTS]; + rct_object_entry sceneryObjects[RCT2_MAX_SMALL_SCENERY_OBJECTS]; + rct_object_entry largeSceneryObjects[RCT2_MAX_LARGE_SCENERY_OBJECTS]; + rct_object_entry wallSceneryObjects[RCT2_MAX_WALL_SCENERY_OBJECTS]; + rct_object_entry bannerObjects[RCT2_MAX_BANNER_OBJECTS]; + rct_object_entry pathObjects[RCT2_MAX_PATH_OBJECTS]; + rct_object_entry pathAdditionObjects[RCT2_MAX_PATH_ADDITION_OBJECTS]; + rct_object_entry sceneryGroupObjects[RCT2_MAX_SCENERY_GROUP_OBJECTS]; + rct_object_entry parkEntranceObjects[RCT2_MAX_PARK_ENTRANCE_OBJECTS]; + rct_object_entry waterObjects[RCT2_MAX_WATER_OBJECTS]; + rct_object_entry scenarioTextObjects[RCT2_MAX_SCENARIO_TEXT_OBJECTS]; + }; + }; // SC6[4] uint16_t elapsed_months;