mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Add Classification field to RTD (#17131)

Browse Source
This commit is contained in:
frutiemax
2022-05-03 22:32:00 -04:00
committed by GitHub
parent 8ab1258af7
commit c1065db88f
9 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/openrct2/ride/Ride.cpp
View File

@@ -5300,27 +5300,8 @@ void Ride::Renew()
RideClassification Ride::GetClassification() const
{
switch (type)
{
case RIDE_TYPE_FOOD_STALL:
case RIDE_TYPE_1D:
case RIDE_TYPE_DRINK_STALL:
case RIDE_TYPE_1F:
case RIDE_TYPE_SHOP:
case RIDE_TYPE_22:
case RIDE_TYPE_50:
case RIDE_TYPE_52:
case RIDE_TYPE_53:
case RIDE_TYPE_54:
return RideClassification::ShopOrStall;
case RIDE_TYPE_INFORMATION_KIOSK:
case RIDE_TYPE_TOILETS:
case RIDE_TYPE_CASH_MACHINE:
case RIDE_TYPE_FIRST_AID:
return RideClassification::KioskOrFacility;
default:
return RideClassification::Ride;
}
const auto& rtd = GetRideTypeDescriptor();
return rtd.Classification;
}
bool Ride::IsRide() const

1
src/openrct2/ride/RideData.h
View File

@@ -189,6 +189,7 @@ struct RideTypeDescriptor
track_colour_preset_list ColourPresets;
RideColourPreview ColourPreview;
RideColourKey ColourKey;
RideClassification Classification = RideClassification::Ride;
bool HasFlag(uint64_t flag) const;
void GetAvailableTrackPieces(RideTrackGroup& res) const;

1
src/openrct2/ride/shops/meta/CashMachine.h
View File

@@ -46,5 +46,6 @@ constexpr const RideTypeDescriptor CashMachineRTD =
SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::CashMachine),
SET_FIELD(Classification, RideClassification::KioskOrFacility),
};
// clang-format on

1
src/openrct2/ride/shops/meta/DrinkStall.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor DrinkStallRTD =
SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::Drink),
SET_FIELD(Classification, RideClassification::ShopOrStall),
};
// clang-format on

1
src/openrct2/ride/shops/meta/FirstAid.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor FirstAidRTD =
SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::FirstAid),
SET_FIELD(Classification, RideClassification::KioskOrFacility),
};
// clang-format on

1
src/openrct2/ride/shops/meta/FoodStall.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor FoodStallRTD =
SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::Food),
SET_FIELD(Classification, RideClassification::ShopOrStall),
};
// clang-format on

1
src/openrct2/ride/shops/meta/InformationKiosk.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor InformationKioskRTD =
SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::InfoKiosk),
SET_FIELD(Classification, RideClassification::KioskOrFacility),
};
// clang-format on

1
src/openrct2/ride/shops/meta/Shop.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor ShopRTD =
SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::Shop),
SET_FIELD(Classification, RideClassification::ShopOrStall),
};
// clang-format on

1
src/openrct2/ride/shops/meta/Toilets.h
View File

@@ -47,5 +47,6 @@ constexpr const RideTypeDescriptor ToiletsRTD =
SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET),
SET_FIELD(ColourPreview, { 0, 0 }),
SET_FIELD(ColourKey, RideColourKey::Toilets),
SET_FIELD(Classification, RideClassification::KioskOrFacility),
};
// clang-format on