mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Make Ride::GetStationObject() const

Browse Source
This commit is contained in:
Michael Steenbeek
2021-12-18 21:49:24 +01:00
committed by GitHub
parent 07a059e10f
commit 4005d3b86a
22 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<StationObject*>(objManager.GetLoadedObject(ObjectType::Station, entrance_style));

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

@@ -382,7 +382,7 @@ public:
int32_t GetTotalLength() const;
int32_t GetTotalTime() const;
StationObject* GetStationObject() const;
const StationObject* GetStationObject() const;
};
#pragma pack(push, 1)

2
src/openrct2/ride/gentle/Circus.cpp
View File

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

2
src/openrct2/ride/gentle/CrookedHouse.cpp
View File

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

2
src/openrct2/ride/gentle/Dodgems.cpp
View File

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

2
src/openrct2/ride/gentle/FerrisWheel.cpp
View File

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

2
src/openrct2/ride/gentle/FlyingSaucers.cpp
View File

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

2
src/openrct2/ride/gentle/HauntedHouse.cpp
View File

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

2
src/openrct2/ride/gentle/MerryGoRound.cpp
View File

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

2
src/openrct2/ride/gentle/ObservationTower.cpp
View File

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

2
src/openrct2/ride/gentle/SpaceRings.cpp
View File

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

2
src/openrct2/ride/gentle/SpiralSlide.cpp
View File

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

2
src/openrct2/ride/thrill/3dCinema.cpp
View File

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

2
src/openrct2/ride/thrill/Enterprise.cpp
View File

@@ -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(

2
src/openrct2/ride/thrill/LaunchedFreefall.cpp
View File

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

2
src/openrct2/ride/thrill/MagicCarpet.cpp
View File

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

2
src/openrct2/ride/thrill/MotionSimulator.cpp
View File

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

2
src/openrct2/ride/thrill/RotoDrop.cpp
View File

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

2
src/openrct2/ride/thrill/SwingingInverterShip.cpp
View File

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

2
src/openrct2/ride/thrill/SwingingShip.cpp
View File

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

2
src/openrct2/ride/thrill/TopSpin.cpp
View File

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

2
src/openrct2/ride/thrill/Twist.cpp
View File

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