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

Merge pull request #19070 from Gymnasiast/remove-unused

Browse Source 
Remove some unused/obsolete things
This commit is contained in:
Michael Steenbeek
2023-01-07 12:04:29 +01:00
committed by GitHub
parent d1ab1dad97 1f3e74b48a
commit 6017983e8f
4 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/Ride.cpp
View File

@@ -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)
{

1
src/openrct2/entity/Guest.h
View File

@@ -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);

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

@@ -2127,15 +2127,6 @@ std::pair<RideMeasurement*, OpenRCT2String> 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

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

@@ -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);