mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Fix #17605. Prevent crash when parks include missing objects (#17606)

Browse Source 
* Fix #17605. Prevent crash when parks include missing objects

Specifically the park needs to have had removed an object that is referenced within a scenery group object.
This commit is contained in:
Duncan
2022-07-26 15:33:30 +01:00
committed by GitHub
parent 628da77c0e
commit 68ded02b14
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -15,6 +15,7 @@
- Fix: [#17508] Grid doesn’t disable after setting patrol area.
- Fix: [#17533] Missing audio when specifying ‘--rct2-data-path’.
- Fix: [#17553] Crash when moving invention list items to empty list.
- Fix: [#17605] Crash when opening parks which have had objects removed externally.
0.4.1 (2022-07-04)
------------------------------------------------------------------------

7
src/openrct2/object/SceneryGroupObject.cpp
View File

@@ -113,7 +113,12 @@ void SceneryGroupObject::UpdateEntryIndexes()
continue;
auto entryIndex = objectManager.GetLoadedObjectEntryIndex(ori->LoadedObject.get());
Guard::Assert(entryIndex != OBJECT_ENTRY_INDEX_NULL, GUARD_LINE);
if (entryIndex == OBJECT_ENTRY_INDEX_NULL)
{
// Some parks have manually deleted objects from the save so they might not be loaded
// silently remove the object from the SceneryGroupObject
continue;
}
auto sceneryType = GetSceneryType(ori->Type);
if (sceneryType.has_value())