From 0bbfdcc7b6cf47cbe79fb2366e457ddb14b08525 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Wed, 27 Apr 2016 17:05:35 +0200
Subject: [PATCH] Fix import of rides without vehicles, fix ride availability,
 fixes #3414 (#3437)

---
 src/rct1/S4Importer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp
index 4b36878ada..24f981ab55 100644
--- a/src/rct1/S4Importer.cpp
+++ b/src/rct1/S4Importer.cpp
@@ -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)