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

Use ride_type_t instead of uint8_t in more places (#17803)

Browse Source 
Part of preparation for making ride types into objects.
This commit is contained in:
Michael Steenbeek
2022-08-13 21:49:19 +02:00
committed by GitHub
parent 6aabe38590
commit d9e23e9dfa
32 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -35,7 +35,7 @@ struct TrackRepositoryItem
{
std::string Name;
std::string Path;
uint8_t RideType = RIDE_TYPE_NULL;
ride_type_t RideType = RIDE_TYPE_NULL;
std::string ObjectEntry;
uint32_t Flags = 0;
};
@@ -57,7 +57,7 @@ class TrackDesignFileIndex final : public FileIndex<TrackRepositoryItem>
{
private:
static constexpr uint32_t MAGIC_NUMBER = 0x58444954; // TIDX
static constexpr uint16_t VERSION = 4;
static constexpr uint16_t VERSION = 5;
static constexpr auto PATTERN = "*.td4;*.td6";
public:
@@ -136,7 +136,7 @@ public:
* @param entry The entry name to count the track list of. Leave empty to count track list for the non-separated types (e.g.
* Hyper-Twister, Car Ride)
*/
size_t GetCountForObjectEntry(uint8_t rideType, const std::string& entry) const override
size_t GetCountForObjectEntry(ride_type_t rideType, const std::string& entry) const override
{
size_t count = 0;
const auto& repo = GetContext()->GetObjectRepository();
@@ -170,7 +170,7 @@ public:
* @param entry The entry name to build a track list for. Leave empty to build track list for the non-separated types (e.g.
* Hyper-Twister, Car Ride)
*/
std::vector<TrackDesignFileRef> GetItemsForObjectEntry(uint8_t rideType, const std::string& entry) const override
std::vector<TrackDesignFileRef> GetItemsForObjectEntry(ride_type_t rideType, const std::string& entry) const override
{
std::vector<TrackDesignFileRef> refs;
const auto& repo = GetContext()->GetObjectRepository();