diff options
author | fonsinchen <fonsinchen@openttd.org> | 2013-06-09 13:03:48 +0000 |
---|---|---|
committer | fonsinchen <fonsinchen@openttd.org> | 2013-06-09 13:03:48 +0000 |
commit | 04e3eb6fabc0e4aff04c189368356b8af15e9655 (patch) | |
tree | aa9d6a025fb3e343fc8cdc9358a913182445210b /src/order_base.h | |
parent | a2ff96d6828bd32f7beb461bfb902880bf46ef75 (diff) | |
download | openttd-04e3eb6fabc0e4aff04c189368356b8af15e9655.tar.xz |
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
Diffstat (limited to 'src/order_base.h')
-rw-r--r-- | src/order_base.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/order_base.h b/src/order_base.h index d361ce67d..7f8ce41f5 100644 --- a/src/order_base.h +++ b/src/order_base.h @@ -201,6 +201,8 @@ private: friend void AfterLoadVehicles(bool part_of_load); ///< For instantiating the shared vehicle chain friend const struct SaveLoad *GetOrderListDescription(); ///< Saving and loading of order lists. + const Order *GetBestLoadableNext(const Vehicle *v, const Order *o1, const Order *o2) const; + Order *first; ///< First order of the order list. VehicleOrderID num_orders; ///< NOSAVE: How many orders there are in the list. VehicleOrderID num_manual_orders; ///< NOSAVE: How many manually added orders are there in the list. @@ -262,7 +264,7 @@ public: inline VehicleOrderID GetNumManualOrders() const { return this->num_manual_orders; } StationID GetNextStoppingStation(const Vehicle *v) const; - const Order *GetNextStoppingOrder(const Vehicle *v, const Order *next, uint hops) const; + const Order *GetNextStoppingOrder(const Vehicle *v, const Order *next, uint hops, bool is_loading = false) const; void InsertOrderAt(Order *new_order, int index); void DeleteOrderAt(int index); |