From 5eeecd82bd67e66ca76fb0cb01602a957917588b Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Wed, 28 Mar 2018 22:41:39 +0200
Subject: [PATCH] Remove fixes to vanilla objects (moved to JSON)

---
 src/openrct2/object/RideObject.cpp | 50 ------------------------------
 src/openrct2/object/RideObject.h   |  1 -
 2 files changed, 51 deletions(-)

diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index 604eae4a0d..adec33615c 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -119,8 +119,6 @@ void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
     {
         context->LogError(OBJECT_ERROR_INVALID_PROPERTY, "Nausea multiplier too high.");
     }
-
-    PerformFixes();
 }
 
 void RideObject::Load()
@@ -407,54 +405,6 @@ void RideObject::ReadLegacyVehicle(IReadObjectContext * context, IStream * strea
     stream->Seek(4, STREAM_SEEK_CURRENT);
 }
 
-void RideObject::PerformFixes()
-{
-    std::string identifier = GetIdentifier();
-    
-    // Add boosters if the track type is eligible
-    for (auto rideType : _legacyType.ride_type)
-    {
-        if (ride_type_supports_boosters(rideType))
-        {
-            _legacyType.enabledTrackPieces |= (1ULL << TRACK_BOOSTER);
-        }
-    }
-    
-    // The rocket cars could take 3 cars per train in RCT1. Restore this.
-    if (String::Equals(identifier, "RCKC    "))
-    {
-        _legacyType.max_cars_in_train = 3 + _legacyType.zero_cars;
-    }
-    // The Wooden Roller Coaster could take 7 cars per train in RCT1.
-    else if (String::Equals(identifier, "PTCT1   "))
-    {
-        _legacyType.max_cars_in_train = 7 + _legacyType.zero_cars;
-    }
-    // The Looping Roller Coaster could take 8 cars per train in RCT1.
-    else if (String::Equals(identifier, "SCHT1   "))
-    {
-        _legacyType.max_cars_in_train = 8 + _legacyType.zero_cars;
-    }
-    // The Steel Twister could take 8 cars per train in RCT1. (The other two vehicles are already correct.)
-    else if (String::Equals(identifier, "BMSD    ") || String::Equals(identifier, "BMSU    "))
-    {
-        _legacyType.max_cars_in_train = 8 + _legacyType.zero_cars;
-    }
-    // Wacky Worlds' Crocodile Ride (a log flume vehicle) is incorrectly locked to 5 cars.
-    else if (String::Equals(identifier, "CROCFLUM"))
-    {
-        _legacyType.cars_per_flat_ride = 0xFF;
-    }
-    // All vanilla/WW/OCC Junior RC vehicles incorrectly have this flag set
-    else if (String::Equals(identifier, "ZLDB    ") ||
-             String::Equals(identifier, "ZLOG    ") ||
-             String::Equals(identifier, "ZPANDA  ") ||
-             String::Equals(identifier, "WHICGRUB"))
-    {
-        _legacyType.enabledTrackPieces &= ~(1ULL << TRACK_SLOPE_STEEP);
-    }
-}
-
 uint8 RideObject::CalculateNumVerticalFrames(const rct_ride_entry_vehicle * vehicleEntry)
 {
     // 0x6DE90B
diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h
index 0e90c6d2ec..35bb401c58 100644
--- a/src/openrct2/object/RideObject.h
+++ b/src/openrct2/object/RideObject.h
@@ -46,7 +46,6 @@ public:
 
 private:
     void ReadLegacyVehicle(IReadObjectContext * context, IStream * stream, rct_ride_entry_vehicle * vehicle);
-    void PerformFixes();
 
     void ReadJsonVehicleInfo(IReadObjectContext * context, const json_t * properties);
     std::vector<rct_ride_entry_vehicle> ReadJsonCars(const json_t * jCars);