From 69721e66f7d5a8b6a5d2cd0b8e78cff2fc611e60 Mon Sep 17 00:00:00 2001 From: Rik Smeets <30838294+rik-smeets@users.noreply.github.com> Date: Wed, 5 Oct 2022 19:26:44 +0200 Subject: [PATCH] Fix #14312: Research ride type message incorrect In some cases, researching a new ride type appeared as a new vehicle instead. --- distribution/changelog.txt | 1 + src/openrct2/management/Research.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 5fc2070508..9aeac35973 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,5 +1,6 @@ 0.4.3 (in development) ------------------------------------------------------------------------ +- Fix: [#14312] Research ride type message incorrect. 0.4.2 (2022-10-05) ------------------------------------------------------------------------ diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index ed884bbe44..b2b72c7664 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -1028,7 +1028,8 @@ void research_determine_first_of_type() for (auto& researchItem : gResearchItemsUninvented) { // The next research item is (sometimes?) also present in gResearchItemsUninvented - if (gResearchNextItem.has_value() && !gResearchNextItem->IsNull() && researchItem == gResearchNextItem.value()) + if (gResearchNextItem.has_value() && !gResearchNextItem->IsNull() + && researchItem.baseRideType == gResearchNextItem.value().baseRideType) { // Copy the "first of type" flag. researchItem.flags = gResearchNextItem->flags;