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

Fix GetOrAllocateRide

This commit is contained in:
Ted John 2019-08-04 20:44:11 +01:00
parent f49447bed5
commit cbc74a3c51
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,15 +184,12 @@ ride_id_t GetNextFreeRideId()
Ride* GetOrAllocateRide(ride_id_t index)
{
Ride* result{};
if (index < _rides.size())
if (_rides.size() <= index)
{
result = &_rides[index];
}
else
{
result = &_rides.emplace_back();
_rides.resize(index + 1);
}
auto result = &_rides[index];
result->id = index;
return result;
}
@ -204,6 +201,7 @@ Ride* get_ride(ride_id_t index)
auto& ride = _rides[index];
if (ride.type != RIDE_TYPE_NULL)
{
assert(ride.id == index);
return &ride;
}
}