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

Codechange: remove parameter from VehicleCargoList::Reassign that is always INVALID_STATION

Browse Source 
(cherry picked from commit a0f6983be4)
This commit is contained in:
Patric Stout
2023-09-10 22:34:02 +02:00
committed by Jonathan G Rennison
parent f5d685a525
commit 2037587c7c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cargopacket.cpp
View File

@@ -725,7 +725,7 @@ void VehicleCargoList::InvalidateCache()
* @return Amount of cargo actually reassigned.
*/
template<VehicleCargoList::MoveToAction Tfrom, VehicleCargoList::MoveToAction Tto>
uint VehicleCargoList::Reassign(uint max_move, StationID)
uint VehicleCargoList::Reassign(uint max_move)
{
static_assert(Tfrom != MTA_TRANSFER && Tto != MTA_TRANSFER);
static_assert(Tfrom - Tto == 1 || Tto - Tfrom == 1);
@@ -739,11 +739,10 @@ uint VehicleCargoList::Reassign(uint max_move, StationID)
* Reassign cargo from MTA_DELIVER to MTA_TRANSFER and take care of the next
* station the cargo wants to visit.
* @param max_move Maximum amount of cargo to reassign.
* @param next_station Station to record as next hop in the reassigned packets.
* @return Amount of cargo actually reassigned.
*/
template<>
uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_TRANSFER>(uint max_move, StationID next_station)
uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_TRANSFER>(uint max_move)
{
max_move = std::min(this->action_counts[MTA_DELIVER], max_move);
@@ -761,7 +760,7 @@ uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList:
*/
++it;
}
cp->next_station = next_station;
cp->next_station = INVALID_STATION;
}
this->action_counts[MTA_DELIVER] -= max_move;
@@ -1139,4 +1138,4 @@ uint StationCargoList::RerouteFromSource(uint max_move, StationCargoList *dest,
*/
template class CargoList<VehicleCargoList, CargoPacketList>;
template class CargoList<StationCargoList, StationCargoPacketMap>;
template uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_KEEP>(uint, StationID);
template uint VehicleCargoList::Reassign<VehicleCargoList::MTA_DELIVER, VehicleCargoList::MTA_KEEP>(uint);