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

Fix unable to save landscape in editor

Browse Source 
Audio objects were being unloaded, while they were still in the loaded object list.
This commit is contained in:
Ted John
2022-05-30 22:34:29 +01:00
committed by GitHub
parent 529c1bcd07
commit 9a4492c704
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -113,9 +113,9 @@ void setup_in_use_selection_flags()
{
auto& objectMgr = OpenRCT2::GetContext()->GetObjectManager();
for (uint8_t objectType = 0; objectType < EnumValue(ObjectType::Count); objectType++)
for (auto objectType : TransientObjectTypes)
{
for (int32_t i = 0; i < object_entry_group_counts[objectType]; i++)
for (int32_t i = 0; i < object_entry_group_counts[EnumValue(objectType)]; i++)
{
Editor::ClearSelectedObject(static_cast<ObjectType>(objectType), i, ObjectSelectionFlags::AllFlags);
@@ -374,8 +374,11 @@ void unload_unselected_objects()
if (!(_objectSelectionFlags[i] & ObjectSelectionFlags::Selected))
{
auto descriptor = ObjectEntryDescriptor(items[i]);
remove_selected_objects_from_research(descriptor);
objectsToUnload.push_back(descriptor);
if (!IsIntransientObjectType(items[i].Type))
{
remove_selected_objects_from_research(descriptor);
objectsToUnload.push_back(descriptor);
}
}
}
object_manager_unload_objects(objectsToUnload);