From 312225ecc203e03a0589749162fbb38293903448 Mon Sep 17 00:00:00 2001 From: mix Date: Mon, 14 Jul 2025 16:30:54 +0100 Subject: [PATCH 1/3] Fix scenery and new ride windows non legacy object file name filter --- src/openrct2-ui/windows/NewRide.cpp | 3 +-- src/openrct2-ui/windows/Scenery.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 7e48b97303..00f8fc918a 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -793,8 +793,7 @@ namespace OpenRCT2::Ui::Windows bool IsFilterInFilename(const RideObject& rideObject) { - auto repoItem = ObjectRepositoryFindObjectByEntry(&(rideObject.GetObjectEntry())); - + const auto* const repoItem = OpenRCT2::GetContext()->GetObjectRepository().FindObject(rideObject.GetIdentifier()); return String::contains(repoItem->Path, _filter, true); } diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 34908386fb..3096d8b8e2 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -1366,7 +1366,7 @@ namespace OpenRCT2::Ui::Windows bool IsFilterInFilename(const Object& object) { - auto repoItem = ObjectRepositoryFindObjectByEntry(&(object.GetObjectEntry())); + const auto* const repoItem = OpenRCT2::GetContext()->GetObjectRepository().FindObject(object.GetIdentifier()); return String::contains(repoItem->Path, _filteredSceneryTab.Filter, true); } From 42217e01dcd75fcce5cff6bfed5073b458f20901 Mon Sep 17 00:00:00 2001 From: mix Date: Mon, 14 Jul 2025 16:44:48 +0100 Subject: [PATCH 2/3] Fix new ride window filter by id not working for non legacy objects --- src/openrct2-ui/windows/NewRide.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 00f8fc918a..8c83da25aa 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -786,9 +786,7 @@ namespace OpenRCT2::Ui::Windows bool IsFilterInIdentifier(const RideObject& rideObject) { - auto objectName = rideObject.GetObjectEntry().GetName(); - - return String::contains(objectName, _filter, true); + return String::contains(rideObject.GetIdentifier(), _filter, true); } bool IsFilterInFilename(const RideObject& rideObject) From 3ce25e97416628782ec684dead2e63cff4a83aee Mon Sep 17 00:00:00 2001 From: mix Date: Mon, 14 Jul 2025 16:51:36 +0100 Subject: [PATCH 3/3] Add changelog entry for scenery and new ride window filter fixes --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 75a671cc83..e51cec70ff 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -5,6 +5,7 @@ - Change: [#24730] Security guards now only walk slowly in crowded areas. - Fix: [#24598] Cannot load .park files that use official legacy footpaths by accident. - Fix: [#24773] The new ride window debug authors does not show the correct authors for non legacy ride objects. +- Fix: [#24775] The scenery and new ride windows do not filter by file name or identifier correctly for non legacy objects. 0.4.24 (2025-07-05) ------------------------------------------------------------------------