From bef76d50171a7d101047dc7e81dea06d74640407 Mon Sep 17 00:00:00 2001
From: discollizard <49206310+discollizard@users.noreply.github.com>
Date: Tue, 11 Mar 2025 13:36:17 -0300
Subject: [PATCH] Remove rideCategory field from ObjectRepositoryItem struct

---
 src/openrct2/object/ObjectRepository.cpp | 6 +-----
 src/openrct2/object/ObjectRepository.h   | 1 -
 src/openrct2/object/RideObject.cpp       | 8 --------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp
index 6dbc2be0a0..5f74f507e4 100644
--- a/src/openrct2/object/ObjectRepository.cpp
+++ b/src/openrct2/object/ObjectRepository.cpp
@@ -76,7 +76,7 @@ class ObjectFileIndex final : public FileIndex<ObjectRepositoryItem>
 {
 private:
     static constexpr uint32_t MAGIC_NUMBER = 0x5844494F; // OIDX
-    static constexpr uint16_t VERSION = 30;
+    static constexpr uint16_t VERSION = 31;
     static constexpr auto PATTERN = "*.dat;*.pob;*.json;*.parkobj";
 
     IObjectRepository& _objectRepository;
@@ -149,10 +149,6 @@ protected:
         {
             case ObjectType::ride:
                 ds << item.RideInfo.RideFlags;
-                for (size_t i = 0; i < std::size(item.RideInfo.rideCategory); i++)
-                {
-                    ds << item.RideInfo.rideCategory[i];
-                }
                 ds << item.RideInfo.RideType;
                 break;
             case ObjectType::sceneryGroup:
diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h
index 5fb0a5b905..39e99d1eef 100644
--- a/src/openrct2/object/ObjectRepository.h
+++ b/src/openrct2/object/ObjectRepository.h
@@ -53,7 +53,6 @@ struct ObjectRepositoryItem
     struct
     {
         uint8_t RideFlags;
-        RideCategory rideCategory[OpenRCT2::RCT2::ObjectLimits::kMaxCategoriesPerRide];
         ride_type_t RideType[OpenRCT2::RCT2::ObjectLimits::kMaxRideTypesPerRideEntry];
     } RideInfo;
     struct
diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index d4441df284..0635f24122 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -386,18 +386,10 @@ ImageIndex RideObject::GetPreviewImage(ride_type_t type)
 
 void RideObject::SetRepositoryItem(ObjectRepositoryItem* item) const
 {
-    // Find the first non-null ride type, to be used when checking the ride group and determining the category.
-    auto firstRideType = _legacyType.GetFirstNonNullRideType();
-    auto category = GetRideTypeDescriptor(firstRideType).Category;
-
     for (int32_t i = 0; i < RCT2::ObjectLimits::kMaxRideTypesPerRideEntry; i++)
     {
         item->RideInfo.RideType[i] = _legacyType.ride_type[i];
     }
-    for (int32_t i = 0; i < RCT2::ObjectLimits::kMaxCategoriesPerRide; i++)
-    {
-        item->RideInfo.rideCategory[i] = category;
-    }
 
     item->RideInfo.RideFlags = 0;
 }