diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index dac2e978d8..1a8ce32c5e 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -5516,7 +5516,7 @@ int32_t ride_get_entry_index(int32_t rideType, int32_t rideSubType) return subType; } -StationObject* Ride::GetStationObject() const +const StationObject* Ride::GetStationObject() const { auto& objManager = GetContext()->GetObjectManager(); return static_cast(objManager.GetLoadedObject(ObjectType::Station, entrance_style)); diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 4c541789a7..1c2772736a 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -382,7 +382,7 @@ public: int32_t GetTotalLength() const; int32_t GetTotalTime() const; - StationObject* GetStationObject() const; + const StationObject* GetStationObject() const; }; #pragma pack(push, 1) diff --git a/src/openrct2/ride/gentle/Circus.cpp b/src/openrct2/ride/gentle/Circus.cpp index 156690779a..d55a851872 100644 --- a/src/openrct2/ride/gentle/Circus.cpp +++ b/src/openrct2/ride/gentle/Circus.cpp @@ -59,7 +59,7 @@ static void PaintCircus( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index fbb68173f4..7e719f37b7 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -90,7 +90,7 @@ static void PaintCrookedHouse( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index 032aba4f65..10c14ac170 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -53,7 +53,7 @@ static void paint_dodgems( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index f136005b3c..cdd31b8a9c 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -127,7 +127,7 @@ static void PaintFerrisWheel( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index 20965f21b0..f0a0ac1937 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -44,7 +44,7 @@ static void paint_flying_saucers( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index a01709d0f8..a047a4e711 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -80,7 +80,7 @@ static void PaintHauntedHouse( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index bb043d8bf1..494fa707cd 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -110,7 +110,7 @@ static void PaintMerryGoRound( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 87f70cce43..e5f3d6ecce 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -93,7 +93,7 @@ static void paint_observation_tower_base( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index ebf3c6026a..535a294633 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -103,7 +103,7 @@ static void paint_space_rings( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = ride->GetStationObject(); + const StationObject* stationObject = ride->GetStationObject(); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, stationObject); switch (trackSequence) diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index 778421011e..5e7ce1649e 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -203,7 +203,7 @@ static void paint_spiral_slide( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); // Base - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 7ed859d531..8c9ad487f8 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -62,7 +62,7 @@ static void Paint3dCinema( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 8ccc4ff913..6bec585ecc 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -101,7 +101,7 @@ static void PaintEnterprise( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = ride->GetStationObject(); + const StationObject* stationObject = ride->GetStationObject(); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork, stationObject); track_paint_util_paint_fences( diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 881103f277..2ddbba913a 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -94,7 +94,7 @@ static void paint_launched_freefall_base( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index b5ece379a7..f680012c47 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -251,7 +251,7 @@ static void PaintMagicCarpet( metal_a_supports_paint_setup( session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]); } - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 76e4d4a7fc..b5480b9d23 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -111,7 +111,7 @@ static void PaintMotionSimulator( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index 68465b46a6..b0d08c1972 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -107,7 +107,7 @@ static void paint_roto_drop_base( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 729a8aa46e..19a0b33bdb 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -141,7 +141,7 @@ static void PaintSwingingInverterShip( uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence]; uint32_t imageId; - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/SwingingShip.cpp b/src/openrct2/ride/thrill/SwingingShip.cpp index 6018cc000f..d8718626d5 100644 --- a/src/openrct2/ride/thrill/SwingingShip.cpp +++ b/src/openrct2/ride/thrill/SwingingShip.cpp @@ -173,7 +173,7 @@ static void PaintSwingingShip( uint32_t imageId; bool hasFence; - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 9fe4a13787..0defa477d4 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -195,7 +195,7 @@ static void PaintTopSpin( wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = nullptr; + const StationObject* stationObject = nullptr; if (ride != nullptr) stationObject = ride->GetStationObject(); diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 2360ae17ff..1cc05ed279 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -95,7 +95,7 @@ static void paint_twist( wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC]); - StationObject* stationObject = ride->GetStationObject(); + const StationObject* stationObject = ride->GetStationObject(); track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_MISC], height, floorSpritesCork, stationObject); switch (trackSequence)