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

Use std::span for GetStations

Browse Source
This commit is contained in:
ζeh Matt
2025-01-06 19:54:56 +02:00
committed by Aaron van Geffen
parent 3d4b106059
commit 1d7bd7ac27
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1046,12 +1046,12 @@ const RideStation& Ride::GetStation(StationIndex stationIndex) const
return stations[stationIndex.ToUnderlying()];
}
std::array<RideStation, OpenRCT2::Limits::kMaxStationsPerRide>& Ride::GetStations()
std::span<RideStation> Ride::GetStations()
{
return stations;
}
const std::array<RideStation, OpenRCT2::Limits::kMaxStationsPerRide>& Ride::GetStations() const
std::span<const RideStation> Ride::GetStations() const
{
return stations;
}

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

@@ -28,6 +28,7 @@
#include <array>
#include <limits>
#include <memory>
#include <span>
#include <string_view>
struct IObjectManager;
@@ -293,8 +294,8 @@ private:
public:
RideStation& GetStation(StationIndex stationIndex = StationIndex::FromUnderlying(0));
const RideStation& GetStation(StationIndex stationIndex = StationIndex::FromUnderlying(0)) const;
std::array<RideStation, OpenRCT2::Limits::kMaxStationsPerRide>& GetStations();
const std::array<RideStation, OpenRCT2::Limits::kMaxStationsPerRide>& GetStations() const;
std::span<RideStation> GetStations();
std::span<const RideStation> GetStations() const;
StationIndex GetStationIndex(const RideStation* station) const;
// Returns the logical station number from the given station. Index 0 = station 1, index 1 = station 2. It accounts for gaps

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

@@ -2308,7 +2308,7 @@ static void test_finish(Ride& ride)
ride.lifecycle_flags &= ~RIDE_LIFECYCLE_TEST_IN_PROGRESS;
ride.lifecycle_flags |= RIDE_LIFECYCLE_TESTED;
auto& rideStations = ride.GetStations();
auto rideStations = ride.GetStations();
for (int32_t i = ride.num_stations - 1; i >= 1; i--)
{
if (rideStations[i - 1].SegmentTime != 0)

2
src/openrct2/world/Map.cpp
View File

@@ -2352,7 +2352,7 @@ void ShiftMap(const TileCoordsXY& amount)
// Rides
for (auto& ride : GetRideManager())
{
auto& stations = ride.GetStations();
auto stations = ride.GetStations();
for (auto& station : stations)
{
shiftIfNotNull(station.Start, amountToMove);