From 86df2b0ea7a2f8f2a9973a6c22757d209bccd82c Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 18 Dec 2021 23:19:46 +0100 Subject: [PATCH] const auto* stationObj --- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/TrackPaint.cpp | 6 +++--- src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp | 2 +- src/openrct2/ride/gentle/MiniGolf.cpp | 2 +- src/openrct2/ride/thrill/GoKarts.cpp | 2 +- src/openrct2/ride/transport/Chairlift.cpp | 4 ++-- src/openrct2/ride/water/BoatHire.cpp | 2 +- src/openrct2/ride/water/SubmarineRide.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 3a5f0d3495..1006a69630 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5399,7 +5399,7 @@ bool ride_has_adjacent_station(Ride* ride) bool ride_has_station_shelter(Ride* ride) { - const auto stationObj = ride->GetStationObject(); + const auto* stationObj = ride->GetStationObject(); return stationObj != nullptr && (stationObj->Flags & STATION_OBJECT_FLAGS::HAS_SHELTER); } diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 2cbabdfedd..6a7828eedf 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -361,7 +361,7 @@ static void track_paint_util_draw_station_impl( const TrackElement& trackElement, int32_t fenceOffsetA, int32_t fenceOffsetB) { CoordsXY position = session->MapPosition; - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); const bool hasGreenLight = trackElement.HasGreenLight(); if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS) @@ -568,7 +568,7 @@ void track_paint_util_draw_station_inverted( uint8_t stationVariant) { CoordsXY position = session->MapPosition; - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); const bool hasGreenLight = trackElement.HasGreenLight(); if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS) @@ -850,7 +850,7 @@ void track_paint_util_draw_narrow_station_platform( const TrackElement& trackElement) { CoordsXY position = session->MapPosition; - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); if (stationObj != nullptr && stationObj->Flags & STATION_OBJECT_FLAGS::NO_PLATFORMS) return; diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index 4d6d4834d7..6f60ea5e39 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -145,7 +145,7 @@ static void multi_dimension_rc_track_station( } track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11); - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); bool hasFence; if (direction == 0 || direction == 2) { diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index 6e6a9d5da9..41a68a2838 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -675,7 +675,7 @@ static void paint_mini_golf_station( paint_session* session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); uint32_t imageId; bool hasFence; diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 6551713b0c..3b6e0146bc 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -348,7 +348,7 @@ static void paint_go_karts_station( paint_session* session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); bool hasFence; uint32_t imageId; diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index 3c95c4270e..862aaa61ae 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -186,7 +186,7 @@ static void chairlift_paint_station_ne_sw( bool isStart = chairlift_paint_util_is_first_track(ride, trackElement, pos, trackType); bool isEnd = chairlift_paint_util_is_last_track(ride, trackElement, pos, trackType); - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_MISC]); @@ -276,7 +276,7 @@ static void chairlift_paint_station_se_nw( bool isStart = chairlift_paint_util_is_first_track(ride, trackElement, pos, trackType); bool isEnd = chairlift_paint_util_is_last_track(ride, trackElement, pos, trackType); - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_MISC]); diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 72e0bae069..cfa075661b 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -65,7 +65,7 @@ static void paint_boat_hire_station( paint_session* session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); if (direction & 1) { diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 046557bfb2..df0092d550 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -79,7 +79,7 @@ static void submarine_ride_paint_track_station( paint_session* session, const Ride& ride, uint8_t trackSequence, uint8_t direction, int32_t height, const TrackElement& trackElement) { - const auto stationObj = ride.GetStationObject(); + const auto* stationObj = ride.GetStationObject(); int32_t heightLower = height - 16; uint32_t imageId;