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/vehicle.cpp
View File

@@ -2156,8 +2156,8 @@ void Vehicle::RefreshNextHopsStats()
const Order *first = this->GetOrder(this->cur_implicit_order_index);
/* Make sure the first order is a station order. */
first = this->orders.list->GetNextStoppingOrder(this, first, 0);
/* Make sure the first order is a useful order. */
first = this->orders.list->GetNextDecisionNode(first, 0);
if (first == NULL) return;
const Order *cur = first;
@@ -2231,7 +2231,7 @@ void Vehicle::RefreshNextHopsStats()
/* Reassign next with the following stop. This can be a station or a
* depot. Allow the order list to be walked twice so that we can
* reassign "first" below without afterwards terminating early here. */
next = this->orders.list->GetNextStoppingOrder(this,
next = this->orders.list->GetNextDecisionNode(
this->orders.list->GetNext(next), hops++ / 2);
if (next == NULL) break;