mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15339 from Broxzier/bugfix/15319-object-selection-hang 

Fix #15319: Clicking on Object Selection Cheat Freezes the Game
This commit is contained in:
Michael Steenbeek 2021-09-04 01:38:59 +02:00 committed by GitHub
parent d71b4e8381 fd2a572f9a
commit 60d596d1f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/object/ObjectLimits.h
View File

@ -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;

2
src/openrct2/object/ObjectList.cpp
View File

@ -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