mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use ride id to determine if the slot is unused

This commit is contained in:
ζeh Matt 2023-02-21 23:29:59 +02:00
parent 063d97f4f2
commit d60890f7e5
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ size_t RideManager::size() const
size_t count = 0;
for (size_t i = 0; i < _maxRideSize; i++)
{
if (_rides[i].type != RIDE_TYPE_NULL)
if (!_rides[i].id.IsNull())
{
count++;
}
@ -156,7 +156,7 @@ RideId GetNextFreeRideId()
{
for (RideId::UnderlyingType i = 0; i < _rides.size(); i++)
{
if (_rides[i].type == RIDE_TYPE_NULL)
if (_rides[i].id.IsNull())
{
return RideId::FromUnderlying(i);
}
@ -182,11 +182,13 @@ void RideDelete(RideId id)
assert(_rides[idx].type != RIDE_TYPE_NULL);
auto& ride = _rides[idx];
ride.id = RideId::GetNull();
ride.type = RIDE_TYPE_NULL;
ride.custom_name = {};
ride.measurement = {};
while (_maxRideSize > 0 && _rides[_maxRideSize - 1].type == RIDE_TYPE_NULL)
// Shrink maximum ride size.
while (_maxRideSize > 0 && _rides[_maxRideSize - 1].id.IsNull())
{
_maxRideSize--;
}
@ -198,14 +200,14 @@ Ride* GetRide(RideId index)
{
return nullptr;
}
const auto idx = index.ToUnderlying();
assert(idx < _rides.size());
if (idx >= _rides.size())
{
return nullptr;
}
auto& ride = _rides[idx];
if (ride.type != RIDE_TYPE_NULL)
{
@ -923,7 +925,10 @@ bool Ride::SupportsStatus(RideStatus s) const
*/
void RideInitAll()
{
std::for_each(std::begin(_rides), std::end(_rides), [](auto& ride) { ride.type = RIDE_TYPE_NULL; });
std::for_each(std::begin(_rides), std::end(_rides), [](auto& ride) {
ride.id = RideId::GetNull();
ride.type = RIDE_TYPE_NULL;
});
_maxRideSize = 0;
}