diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 276658a14f..ece7111fb9 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -464,7 +464,6 @@ static void window_editor_object_selection_close(rct_window *w) research_reset_current_item(); gSilentResearch = false; } - research_remove_non_separate_vehicle_types(); auto intent = Intent(INTENT_ACTION_REFRESH_NEW_RIDES); context_broadcast_intent(&intent); diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 7fc5712cbc..615cd93576 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -333,7 +333,6 @@ namespace Editor if (fromSave) { research_populate_list_random(); - research_remove_non_separate_vehicle_types(); if (gParkFlags & PARK_FLAGS_NO_MONEY) { diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 907fa86080..8bf737f975 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -447,66 +447,6 @@ void research_reset_current_item() gResearchProgress = 0; } -/** - * - * rct2: 0x0068585B - */ -void research_remove_non_separate_vehicle_types() -{ - rct_research_item * researchItem, * researchItem2; - - researchItem = gResearchItems; - while ((researchItem + 1)->rawValue != RESEARCHED_ITEMS_END) - { - researchItem++; - } - - do - { - loopBeginning: - if ( - researchItem != gResearchItems && - researchItem->rawValue != RESEARCHED_ITEMS_SEPARATOR && - researchItem->rawValue != RESEARCHED_ITEMS_END && - researchItem->type == RESEARCH_ENTRY_TYPE_RIDE) - { - rct_ride_entry * rideEntry = get_ride_entry(researchItem->entryIndex); - if (!(rideEntry->flags & (RIDE_ENTRY_FLAG_SEPARATE_RIDE))) - { - // Check if ride type already exists further up for a vehicle type that isn't displayed as a ride - researchItem2 = researchItem - 1; - do - { - if ( - researchItem2->rawValue != RESEARCHED_ITEMS_SEPARATOR && - researchItem2->type == RESEARCH_ENTRY_TYPE_RIDE - ) - { - rideEntry = get_ride_entry(researchItem2->entryIndex); - if (!(rideEntry->flags & (RIDE_ENTRY_FLAG_SEPARATE_RIDE))) - { - - if (researchItem->baseRideType == researchItem2->baseRideType) - { - // Remove item - researchItem2 = researchItem; - do - { - *researchItem2 = *(researchItem2 + 1); - } - while ((researchItem2++)->rawValue != RESEARCHED_ITEMS_END_2); - goto loopBeginning; - } - } - } - } - while ((researchItem2--) != gResearchItems); - } - } - } - while ((researchItem--) != gResearchItems); -} - /** * * rct2: 0x006857FA diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index cdd804add6..f742ab61ac 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -119,7 +119,6 @@ void research_reset_items(); void research_update_uncompleted_types(); void research_update(); void research_reset_current_item(); -void research_remove_non_separate_vehicle_types(); void research_populate_list_random(); void research_populate_list_researched(); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 01ee19a14b..ee5e62b25b 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2021,8 +2021,6 @@ private: } } - research_remove_non_separate_vehicle_types(); - // Research funding / priority uint8 activeResearchTypes = 0; if (_s4.research_priority & RCT1_RESEARCH_CATEGORY_ROLLERCOASTERS)