mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity

Replace some leftover use of uint8_t for ride subtype

Browse Source
This commit is contained in:
Michael Steenbeek
2021-01-15 19:35:06 +01:00
committed by GitHub
parent 5cd3014334
commit 32d8dadc2b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3107,11 +3107,11 @@ vehicle_colour ride_get_vehicle_colour(Ride* ride, int32_t vehicleIndex)
return result;
}
static bool ride_does_vehicle_colour_exist(uint8_t ride_sub_type, vehicle_colour* vehicleColour)
static bool ride_does_vehicle_colour_exist(ObjectEntryIndex subType, vehicle_colour* vehicleColour)
{
for (auto& ride : GetRideManager())
{
if (ride.subtype != ride_sub_type)
if (ride.subtype != subType)
continue;
if (ride.vehicle_colours[0].Body != vehicleColour->main)
continue;
@@ -3120,13 +3120,13 @@ static bool ride_does_vehicle_colour_exist(uint8_t ride_sub_type, vehicle_colour
return true;
}
int32_t ride_get_unused_preset_vehicle_colour(uint8_t ride_sub_type)
int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType)
{
if (ride_sub_type >= MAX_RIDE_OBJECTS)
if (subType >= MAX_RIDE_OBJECTS)
{
return 0;
}
rct_ride_entry* rideEntry = get_ride_entry(ride_sub_type);
rct_ride_entry* rideEntry = get_ride_entry(subType);
if (rideEntry == nullptr)
{
return 0;
@@ -3143,7 +3143,7 @@ int32_t ride_get_unused_preset_vehicle_colour(uint8_t ride_sub_type)
int32_t randomConfigIndex = util_rand() % numColourConfigurations;
vehicle_colour* preset = &presetList->list[randomConfigIndex];
if (ride_does_vehicle_colour_exist(ride_sub_type, preset))
if (ride_does_vehicle_colour_exist(subType, preset))
{
return randomConfigIndex;
}

2
src/openrct2/ride/Ride.h
View File

@@ -1126,7 +1126,7 @@ int32_t ride_get_total_length(const Ride* ride);
int32_t ride_get_total_time(Ride* ride);
TrackColour ride_get_track_colour(Ride* ride, int32_t colourScheme);
vehicle_colour ride_get_vehicle_colour(Ride* ride, int32_t vehicleIndex);
int32_t ride_get_unused_preset_vehicle_colour(uint8_t ride_sub_type);
int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType);
void ride_set_vehicle_colours_to_random_preset(Ride* ride, uint8_t preset_index);
void ride_measurements_update();
void ride_breakdown_add_news_item(Ride* ride);