dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: rename next_station to next_hop to avoid confusing with another next_station

Browse Source
This commit is contained in:
Patric Stout
2023-09-10 22:33:33 +02:00
committed by Patric Stout
parent a0f6983be4
commit 9f8c1ea552
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cargopacket.h
View File

@@ -49,7 +49,7 @@ private:
SourceType source_type{SourceType::Industry}; ///< Type of \c source_id.
StationID first_station{INVALID_STATION}; ///< The station where the cargo came from first.
StationID next_station{INVALID_STATION}; ///< Station where the cargo wants to go next.
StationID next_hop{INVALID_STATION}; ///< Station where the cargo wants to go next.
/** The CargoList caches, thus needs to know about it. */
template <class Tinst, class Tcont> friend class CargoList;
@@ -74,11 +74,11 @@ public:
/**
* Sets the station where the packet is supposed to go next.
* @param next_station Next station the packet should go to.
* @param next_hop Next station the packet should go to.
*/
void SetNextStation(StationID next_station)
void SetNextHop(StationID next_hop)
{
this->next_station = next_station;
this->next_hop = next_hop;
}
/**
@@ -172,9 +172,9 @@ public:
* Gets the ID of station the cargo wants to go next.
* @return Next station for this packets.
*/
inline StationID GetNextStation() const
inline StationID GetNextHop() const
{
return this->next_station;
return this->next_hop;
}
static void InvalidateAllFrom(SourceType src_type, SourceID src);