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

Fix #7772. Check for vehicles using an object when setting inuse (#14056)

Browse Source 
* Fix #7772. Check for vehicles using an object when setting inuse

* Update changelog
This commit is contained in:
Duncan
2021-02-10 18:14:23 +00:00
committed by GitHub
parent f99c35d88f
commit fe8b8280e8
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -200,6 +200,24 @@ void setup_in_use_selection_flags()
}
}
// Apply selected object status for hacked vehicles that may not have an associated ride
for (auto vehicle : EntityList<Vehicle>(EntityListId::TrainHead))
{
ObjectEntryIndex type = vehicle->ride_subtype;
if (type != RIDE_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
{
Editor::SetSelectedObject(ObjectType::Ride, type, OBJECT_SELECTION_FLAG_SELECTED);
}
}
for (auto vehicle : EntityList<Vehicle>(EntityListId::Vehicle))
{
ObjectEntryIndex type = vehicle->ride_subtype;
if (type != RIDE_ENTRY_INDEX_NULL) // cable lifts use index null. Ignore them
{
Editor::SetSelectedObject(ObjectType::Ride, type, OBJECT_SELECTION_FLAG_SELECTED);
}
}
int32_t numObjects = static_cast<int32_t>(object_repository_get_items_count());
const ObjectRepositoryItem* items = object_repository_get_items();
for (int32_t i = 0; i < numObjects; i++)