From fd2a572f9a1da621d8a09b86ae84d2d2096bad5f Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 4 Sep 2021 01:01:41 +0200 Subject: [PATCH] Fix #15319: Clicking on Object Selection Cheat Freezes the Game MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes it by adding limits for the missing path types. Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com> --- src/openrct2/object/ObjectLimits.h | 10 +++++++++- src/openrct2/object/ObjectList.cpp | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/openrct2/object/ObjectLimits.h b/src/openrct2/object/ObjectLimits.h index febbda2544..f9ebf6ffd7 100644 --- a/src/openrct2/object/ObjectLimits.h +++ b/src/openrct2/object/ObjectLimits.h @@ -26,6 +26,8 @@ constexpr const uint16_t MAX_TERRAIN_SURFACE_OBJECTS = 18; constexpr const uint16_t MAX_TERRAIN_EDGE_OBJECTS = 255; constexpr const uint16_t MAX_STATION_OBJECTS = 255; constexpr const uint16_t MAX_MUSIC_OBJECTS = 255; +constexpr const uint16_t MAX_FOOTPATH_SURFACE_OBJECTS = 255; +constexpr const uint16_t MAX_FOOTPATH_RAILINGS_OBJECTS = 255; // clang-format off constexpr const uint16_t OBJECT_ENTRY_COUNT = @@ -39,7 +41,13 @@ constexpr const uint16_t OBJECT_ENTRY_COUNT = MAX_SCENERY_GROUP_OBJECTS + MAX_PARK_ENTRANCE_OBJECTS + MAX_WATER_OBJECTS + - MAX_SCENARIO_TEXT_OBJECTS; + MAX_SCENARIO_TEXT_OBJECTS + + MAX_TERRAIN_SURFACE_OBJECTS + + MAX_TERRAIN_EDGE_OBJECTS + + MAX_STATION_OBJECTS + + MAX_MUSIC_OBJECTS + + MAX_FOOTPATH_SURFACE_OBJECTS + + MAX_FOOTPATH_RAILINGS_OBJECTS; // clang-format on constexpr const uint8_t DAT_NAME_LENGTH = 8; diff --git a/src/openrct2/object/ObjectList.cpp b/src/openrct2/object/ObjectList.cpp index 26035d97f6..967ccef4a8 100644 --- a/src/openrct2/object/ObjectList.cpp +++ b/src/openrct2/object/ObjectList.cpp @@ -38,6 +38,8 @@ int32_t object_entry_group_counts[] = { MAX_TERRAIN_EDGE_OBJECTS, MAX_STATION_OBJECTS, MAX_MUSIC_OBJECTS, + MAX_FOOTPATH_SURFACE_OBJECTS, + MAX_FOOTPATH_RAILINGS_OBJECTS, }; // 98DA2C