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

Fix import of rides without vehicles, fix ride availability, fixes #3414 (#3437)

Browse Source
This commit is contained in:
Michael Steenbeek
2016-04-27 17:05:35 +02:00
committed by Ted John
parent 8e59a6c102
commit 0bbfdcc7b6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rct1/S4Importer.cpp
View File

@@ -263,9 +263,8 @@ void S4Importer::AddAvailableEntriesFromRides()
for (size_t i = 0; i < Util::CountOf(_s4.rides); i++)
{
rct1_ride * ride = &_s4.rides[i];
if (ride->type != RCT1_RIDE_TYPE_NULL)
if (ride->type != RCT1_RIDE_TYPE_NULL && RCT1::RideTypeUsesVehicles(ride->type))
{
// TODO might need to check if ride type has a vehicle type
AddEntryForVehicleType(ride->type, ride->vehicle_type);
}
}
@@ -854,6 +853,8 @@ void S4Importer::ImportResearch()
}
research_remove_non_separate_vehicle_types();
// Fixes avaibility of rides
sub_684AC3();
// Research funding / priority
uint8 activeResearchTypes = 0;
@@ -889,7 +890,6 @@ void S4Importer::ImportResearch()
gResearchNextCategory = _s4.next_research_category;
// gResearchExpectedDay =
// gResearchExpectedMonth =
}
void S4Importer::InsertResearchVehicle(const rct1_research_item * researchItem, bool researched)