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

(svn r26263) -Fix [FS#5865]: Don't run into infinite recursion when getting next stopping station

Browse Source
This commit is contained in:
fonsinchen
2014-01-16 20:50:43 +00:00
parent 6955e60f07
commit e0541a47e6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/order_cmd.cpp
View File

@@ -428,10 +428,10 @@ StationIDStack OrderList::GetNextStoppingStation(const Vehicle *v, const Order *
hops);
const Order *advance = this->GetNextDecisionNode(
this->GetNext(next), hops);
if (advance == NULL) {
next = skip_to;
} else if (skip_to == NULL) {
next = advance;
if (advance == NULL || advance == first) {
next = (skip_to == first) ? NULL : skip_to;
} else if (skip_to == NULL || skip_to == first) {
next = (advance == first) ? NULL : advance;
} else {
StationIDStack st1 = this->GetNextStoppingStation(v, skip_to);
StationIDStack st2 = this->GetNextStoppingStation(v, advance);