diff --git a/src/cargoaction.cpp b/src/cargoaction.cpp index de0a37c558..ac88c76173 100644 --- a/src/cargoaction.cpp +++ b/src/cargoaction.cpp @@ -167,7 +167,7 @@ bool CargoTransfer::operator()(CargoPacket *cp) if (cp_new == nullptr) return false; this->source->RemoveFromMeta(cp_new, VehicleCargoList::MTA_TRANSFER, cp_new->Count()); /* No transfer credits here as they were already granted during Stage(). */ - this->destination->Append(cp_new, cp_new->GetNextStation()); + this->destination->Append(cp_new, cp_new->GetNextHop()); return cp_new == cp; } @@ -218,8 +218,8 @@ bool VehicleCargoReroute::operator()(CargoPacket *cp, std::vector { CargoPacket *cp_new = this->Preprocess(cp); if (cp_new == nullptr) cp_new = cp; - if (cp_new->GetNextStation() == this->avoid || cp_new->GetNextStation() == this->avoid2) { - cp->SetNextStation(this->ge->GetVia(cp_new->GetFirstStation(), this->avoid, this->avoid2)); + if (cp_new->GetNextHop() == this->avoid || cp_new->GetNextHop() == this->avoid2) { + cp->SetNextHop(this->ge->GetVia(cp_new->GetFirstStation(), this->avoid, this->avoid2)); } if (unlikely(this->source != this->destination)) { this->source->RemoveFromMeta(cp_new, VehicleCargoList::MTA_TRANSFER, cp_new->Count()); diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index 848c89403b..853a493912 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -133,7 +133,7 @@ CargoPacket::CargoPacket(StationID first_station, TileIndex source_xy, uint16 co * @param count Number of cargo entities to put in this packet. * @param periods_in_transit Number of cargo aging periods the cargo has been in transit. * @param first_station Station the cargo was initially loaded. - * @param next_station Next station the cargo wants to go. + * @param next_hop Next station the cargo wants to go. * @param source_xy Station location the cargo was initially loaded. * @param feeder_share Feeder share the packet has already accumulated. * @param source_type 'Type' of source the packet comes from (for subsidies). @@ -141,7 +141,7 @@ CargoPacket::CargoPacket(StationID first_station, TileIndex source_xy, uint16 co * @note We have to zero memory ourselves here because we are using a 'new' * that, in contrary to all other pools, does not memset to 0. */ -CargoPacket::CargoPacket(uint16_t count, uint16_t periods_in_transit, StationID first_station, StationID next_station, TileIndex source_xy, Money feeder_share, SourceType source_type, SourceID source_id) : +CargoPacket::CargoPacket(uint16_t count, uint16_t periods_in_transit, StationID first_station, StationID next_hop, TileIndex source_xy, Money feeder_share, SourceType source_type, SourceID source_id) : count(count), periods_in_transit(periods_in_transit), feeder_share(feeder_share), @@ -149,7 +149,7 @@ CargoPacket::CargoPacket(uint16_t count, uint16_t periods_in_transit, StationID source_id(source_id), source_type(source_type), first_station(first_station), - next_station(next_station) + next_hop(next_hop) { dbg_assert(count != 0); } @@ -174,7 +174,7 @@ CargoPacket *CargoPacket::Split(uint new_size) if (!CargoPacket::CanAllocateItem()) return nullptr; Money fs = this->GetFeederShare(new_size); - CargoPacket *cp_new = new CargoPacket(new_size, this->periods_in_transit, this->first_station, this->next_station, this->source_xy, fs, this->source_type, this->source_id); + CargoPacket *cp_new = new CargoPacket(new_size, this->periods_in_transit, this->first_station, this->next_hop, this->source_xy, fs, this->source_type, this->source_id); this->feeder_share -= fs; if (this->flags & CPF_HAS_DEFERRED_PAYMENT) { @@ -690,7 +690,7 @@ bool VehicleCargoList::Stage(bool accepted, StationID current_station, StationID share = payment->PayTransfer(cp, cp->count); cp->AddFeederShare(share); this->feeder_share += share; - cp->next_station = cargo_next; + cp->next_hop = cargo_next; break; default: NOT_REACHED(); @@ -760,7 +760,7 @@ uint VehicleCargoList::Reassignnext_station = INVALID_STATION; + cp->next_hop = INVALID_STATION; } this->action_counts[MTA_DELIVER] -= max_move; diff --git a/src/cargopacket.h b/src/cargopacket.h index 21deb8f12f..650f99d4b1 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -59,7 +59,7 @@ private: SourceType source_type = SourceType::Industry; ///< Type of \c source_id. uint8 flags = 0; ///< NOSAVE: temporary flags 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. /** Cargo packet flag bits in CargoPacket::flags. */ enum CargoPacketFlags { @@ -89,11 +89,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; } /** @@ -189,9 +189,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); diff --git a/src/sl/cargopacket_sl.cpp b/src/sl/cargopacket_sl.cpp index e5e62b3cb9..ebf070504b 100644 --- a/src/sl/cargopacket_sl.cpp +++ b/src/sl/cargopacket_sl.cpp @@ -114,7 +114,7 @@ SaveLoadTable GetCargoPacketDesc() static const SaveLoad _cargopacket_desc[] = { SLE_VAR(CargoPacket, first_station, SLE_UINT16), SLE_VAR(CargoPacket, source_xy, SLE_UINT32), - SLE_VAR(CargoPacket, next_station, SLE_FILE_U32 | SLE_VAR_U16), + SLE_VAR(CargoPacket, next_hop, SLE_FILE_U32 | SLE_VAR_U16), SLE_VAR(CargoPacket, count, SLE_UINT16), SLE_CONDVAR_X(CargoPacket, periods_in_transit, SLE_FILE_U8 | SLE_VAR_U16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_MORE_CARGO_AGE, 0, 0)), SLE_CONDVAR_X(CargoPacket, periods_in_transit, SLE_UINT16, SL_MIN_VERSION, SL_MAX_VERSION, SlXvFeatureTest(XSLFTO_AND, XSLFI_MORE_CARGO_AGE)),