diff options
author | fonsinchen <fonsinchen@openttd.org> | 2013-06-09 13:04:32 +0000 |
---|---|---|
committer | fonsinchen <fonsinchen@openttd.org> | 2013-06-09 13:04:32 +0000 |
commit | 741c431caa59670bbe53740cc8a864992ce1bbd2 (patch) | |
tree | 42e4ab0bb88bb7afa969a268dc03dbe4b611a41b /src/cargopacket.h | |
parent | 04e3eb6fabc0e4aff04c189368356b8af15e9655 (diff) | |
download | openttd-741c431caa59670bbe53740cc8a864992ce1bbd2.tar.xz |
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
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 c31e4db58..dc1e66ba2 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -443,6 +443,7 @@ public: }; typedef MultiMap<StationID, CargoPacket *> StationCargoPacketMap; +typedef std::map<StationID, uint> StationCargoAmountMap; /** * CargoList that is used for stations. @@ -532,7 +533,7 @@ public: uint Reserve(uint max_move, VehicleCargoList *dest, TileIndex load_place, StationID next); uint Load(uint max_move, VehicleCargoList *dest, TileIndex load_place, StationID next); - uint Truncate(uint max_move = UINT_MAX); + uint Truncate(uint max_move = UINT_MAX, StationCargoAmountMap *cargo_per_source = NULL); uint Reroute(uint max_move, StationCargoList *dest, StationID avoid, StationID avoid2, const GoodsEntry *ge); /** |