mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-27 17:52:54 +01:00
Code Issues Releases Wiki Activity

Remove rideCategory field from ObjectRepositoryItem struct

Browse Source
This commit is contained in:
discollizard
2025-03-11 13:36:17 -03:00
committed by GitHub
parent b29fb512fd
commit bef76d5017
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/object/ObjectRepository.cpp
View File

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

1
src/openrct2/object/ObjectRepository.h
View File

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

8
src/openrct2/object/RideObject.cpp
View File

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