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

(svn r25736) -Codechange: move condition prediction out of GetNextStoppingOrder so that we can access both branches in calling code

Browse Source
This commit is contained in:
fonsinchen
2013-08-20 21:22:35 +00:00
parent d8365c63fd
commit 5c0b766ed9
3 changed files with 76 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/order_base.h
View File

@@ -201,7 +201,7 @@ 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;
StationID 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.
@@ -263,8 +263,8 @@ 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, bool is_loading = false) const;
StationID GetNextStoppingStation(const Vehicle *v, const Order *first = NULL) const;
const Order *GetNextDecisionNode(const Order *next, uint hops) const;
void InsertOrderAt(Order *new_order, int index);
void DeleteOrderAt(int index);