diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-02 08:15:36 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-02 08:15:36 +0000 |
| commit | 200e35cd8c68d9e2ab17f718dd0ba1bc344eb160 (patch) | |
| tree | d222aa88e1a5f3ed3a4d12f649e0cef919980c56 /src/order_cmd.cpp | |
| parent | 5867336b6e33bafb4984b5284f5dcf06f07e49bd (diff) | |
| download | openttd-200e35cd8c68d9e2ab17f718dd0ba1bc344eb160.tar.xz | |
(svn r12935) -Fix [FS#1975]: vehicles forget their manual depot order when stopping at a station. Now we just pass through the station without stopping when a vehicle has been given a depot order.
Diffstat (limited to 'src/order_cmd.cpp')
| -rw-r--r-- | src/order_cmd.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index f9f849a01..24c8ade89 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -1781,6 +1781,7 @@ bool Order::ShouldStopAtStation(const Vehicle *v, StationID station) const { bool is_dest_station = this->IsType(OT_GOTO_STATION) && this->dest == station; return + (!this->IsType(OT_GOTO_DEPOT) || (this->GetDepotOrderType() & ODTFB_PART_OF_ORDERS) != 0) && v->last_station_visited != station && // Do stop only when we've not just been there /* Finally do stop when there is no non-stop flag set for this type of station. */ !(this->GetNonStopType() & (is_dest_station ? ONSF_NO_STOP_AT_DESTINATION_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS)); |