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

Remove research_remove_non_separate_vehicle_types()

Browse Source 
This removes more usages of the SEPARATE_RIDE flag.
This commit is contained in:
Michael Steenbeek
2018-01-09 16:47:08 +01:00
parent e15c8f8b3b
commit 0ae5d7d476
5 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -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);

1
src/openrct2/Editor.cpp
View File

@@ -333,7 +333,6 @@ namespace Editor
if (fromSave)
{
research_populate_list_random();
research_remove_non_separate_vehicle_types();
if (gParkFlags & PARK_FLAGS_NO_MONEY)
{

60
src/openrct2/management/Research.cpp
View File

@@ -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

1
src/openrct2/management/Research.h
View File

@@ -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();

2
src/openrct2/rct1/S4Importer.cpp
View File

@@ -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)