mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Rework rct_vehicle_colour (#16051)

Browse Source 
* Remove rct_vehicle_colour and replace with VehicleColour

* Update network version

* Update replay version
This commit is contained in:
Duncan
2022-08-13 20:30:30 +01:00
committed by GitHub
parent 49215a52cf
commit adc51ad9aa
31 changed files with 88 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/ride/TrackDesign.cpp
View File

@@ -113,9 +113,7 @@ StringId TrackDesign::CreateTrackDesign(TrackDesignState& tds, const Ride& ride)
for (int32_t i = 0; i < RCT2::Limits::MaxTrainsPerRide; i++)
{
vehicle_colours[i].body_colour = ride.vehicle_colours[i].Body;
vehicle_colours[i].trim_colour = ride.vehicle_colours[i].Trim;
vehicle_additional_colour[i] = ride.vehicle_colours[i].Tertiary;
vehicle_colours[i] = ride.vehicle_colours[i];
}
for (int32_t i = 0; i < RCT12::Limits::NumColourSchemes; i++)
@@ -608,7 +606,6 @@ void TrackDesign::Serialise(DataSerialiser& stream)
stream << DS_TAG(vehicle_object);
stream << DS_TAG(space_required_x);
stream << DS_TAG(space_required_y);
stream << DS_TAG(vehicle_additional_colour);
stream << DS_TAG(lift_hill_speed);
stream << DS_TAG(num_circuits);
@@ -2014,9 +2011,7 @@ static bool TrackDesignPlacePreview(TrackDesignState& tds, TrackDesign* td6, mon
{
for (int32_t i = 0; i < RCT12::Limits::MaxVehicleColours; i++)
{
ride->vehicle_colours[i].Body = td6->vehicle_colours[i].body_colour;
ride->vehicle_colours[i].Trim = td6->vehicle_colours[i].trim_colour;
ride->vehicle_colours[i].Tertiary = td6->vehicle_additional_colour[i];
ride->vehicle_colours[i] = td6->vehicle_colours[i];
}
}