diff options
author | fonsinchen <fonsinchen@openttd.org> | 2014-02-09 21:10:25 +0000 |
---|---|---|
committer | fonsinchen <fonsinchen@openttd.org> | 2014-02-09 21:10:25 +0000 |
commit | 88787412b6ba8eceac27faf96425a44d230551c9 (patch) | |
tree | d62c095a38824e10902acdfce91da35bacf9602d /src/cargopacket.h | |
parent | a4941e759c95f218c10c5e13854901a6fede46ed (diff) | |
download | openttd-88787412b6ba8eceac27faf96425a44d230551c9.tar.xz |
(svn r26327) -Fix [FS#5901]: Take care of next_station when reassigning from MTA_DELIVER to MTA_TRANSFER.
Diffstat (limited to 'src/cargopacket.h')
-rw-r--r-- | src/cargopacket.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cargopacket.h b/src/cargopacket.h index d425f30f5..5d0f67166 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -429,7 +429,8 @@ public: * amount of cargo to be moved. Second parameter is destination (if * applicable), return value is amount of cargo actually moved. */ - uint Reassign(uint max_move, MoveToAction from, MoveToAction to); + template<MoveToAction Tfrom, MoveToAction Tto> + uint Reassign(uint max_move, TileOrStationID update = INVALID_TILE); uint Return(uint max_move, StationCargoList *dest, StationID next_station); uint Unload(uint max_move, StationCargoList *dest, CargoPayment *payment); uint Shift(uint max_move, VehicleCargoList *dest); |