From aae204c7d1b50146d6835cad9b820684e1b62f2f Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 7 Jan 2023 02:49:36 +0100 Subject: [PATCH 1/2] Remove declaration of GuestHasValidXY() --- src/openrct2/entity/Guest.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openrct2/entity/Guest.h b/src/openrct2/entity/Guest.h index 928fd388a3..7177be48b2 100644 --- a/src/openrct2/entity/Guest.h +++ b/src/openrct2/entity/Guest.h @@ -417,7 +417,6 @@ private: void loc_68F9F3(); void loc_68FA89(); int32_t CheckEasterEggName(int32_t index) const; - bool GuestHasValidXY() const; void GivePassingPeepsPurpleClothes(Guest* passingPeep); void GivePassingPeepsPizza(Guest* passingPeep); void MakePassingPeepsSick(Guest* passingPeep); From 1f3e74b48a1f5e3c10ba19422a83a916e2ee271c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 7 Jan 2023 02:51:58 +0100 Subject: [PATCH 2/2] Remove obsolete ride_get_track_colour() This was useful before the fields of Ride were rearranged to actually be a TrackColour struct. --- src/openrct2-ui/windows/Ride.cpp | 6 +++--- src/openrct2/ride/Ride.cpp | 9 --------- src/openrct2/ride/Ride.h | 1 - 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 369ac47ab3..73ed13ad43 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -4638,7 +4638,7 @@ static void WindowRideColourInvalidate(rct_window* w) // Track colours int32_t colourScheme = w->ride_colour; - trackColour = ride_get_track_colour(ride, colourScheme); + trackColour = ride->track_colour[colourScheme]; // Maze style const auto& rtd = ride->GetRideTypeDescriptor(); @@ -4880,7 +4880,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi) { w->windowPos + ScreenCoordsXY{ trackPreviewWidget.right - 1, trackPreviewWidget.bottom - 1 } } }, PALETTE_INDEX_12); - auto trackColour = ride_get_track_colour(ride, w->ride_colour); + auto trackColour = ride->track_colour[w->ride_colour]; // auto rideEntry = ride->GetRideEntry(); @@ -4940,7 +4940,7 @@ static void WindowRideColourPaint(rct_window* w, rct_drawpixelinfo* dpi) } // Entrance preview - trackColour = ride_get_track_colour(ride, 0); + trackColour = ride->track_colour[0]; const auto& entrancePreviewWidget = w->widgets[WIDX_ENTRANCE_PREVIEW]; if (entrancePreviewWidget.type != WindowWidgetType::Empty) { diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 080caa0e60..bf6ffe9498 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -2127,15 +2127,6 @@ std::pair Ride::GetMeasurement() #pragma region Colour functions -TrackColour ride_get_track_colour(Ride* ride, int32_t colourScheme) -{ - TrackColour result; - result.main = ride->track_colour[colourScheme].main; - result.additional = ride->track_colour[colourScheme].additional; - result.supports = ride->track_colour[colourScheme].supports; - return result; -} - VehicleColour ride_get_vehicle_colour(Ride* ride, int32_t vehicleIndex) { // Prevent indexing array out of bounds diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 0e03bfe5ac..11e81f0237 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -1021,7 +1021,6 @@ bool ride_try_get_origin_element(const Ride* ride, CoordsXYE* output); void ride_clear_blocked_tiles(Ride* ride); Staff* ride_get_mechanic(Ride* ride); Staff* ride_get_assigned_mechanic(Ride* ride); -TrackColour ride_get_track_colour(Ride* ride, int32_t colourScheme); VehicleColour ride_get_vehicle_colour(Ride* ride, int32_t vehicleIndex); int32_t ride_get_unused_preset_vehicle_colour(ObjectEntryIndex subType); void ride_set_vehicle_colours_to_random_preset(Ride* ride, uint8_t preset_index);