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

Use a pointer instead of reference as a member. 

This allows the assignment operator for the iterator to be generated
automatically by the compiler.
This commit is contained in:
Breno Guimaraes 2020-04-18 03:34:39 -03:00
parent c5d877f644
commit 38ffc4f577
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -980,7 +980,7 @@ struct RideManager
friend RideManager;
private:
RideManager& _rideManager;
RideManager* _rideManager;
size_t _index{};
size_t _endIndex{};
@ -993,11 +993,11 @@ struct RideManager
private:
Iterator(RideManager& rideManager, size_t beginIndex, size_t endIndex)
: _rideManager(rideManager)
: _rideManager(&rideManager)
, _index(beginIndex)
, _endIndex(endIndex)
{
if (_index < _endIndex && _rideManager[static_cast<ride_id_t>(_index)] == nullptr)
if (_index < _endIndex && (*_rideManager)[static_cast<ride_id_t>(_index)] == nullptr)
{
++(*this);
}
@ -1009,7 +1009,7 @@ struct RideManager
do
{
_index++;
} while (_index < _endIndex && _rideManager[static_cast<ride_id_t>(_index)] == nullptr);
} while (_index < _endIndex && (*_rideManager)[static_cast<ride_id_t>(_index)] == nullptr);
return *this;
}
Iterator operator++(int)
@ -1028,7 +1028,7 @@ struct RideManager
}
Ride& operator*()
{
return *_rideManager[static_cast<ride_id_t>(_index)];
return *(*_rideManager)[static_cast<ride_id_t>(_index)];
}
};