(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.
authorrubidium
Fri, 02 May 2008 08:15:36 +0000
changeset 9076 30574351a0ad
parent 9075 05ee343edc0d
child 9077 1ac587da1d58
(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.
src/order_cmd.cpp
--- a/src/order_cmd.cpp	Fri May 02 02:06:57 2008 +0000
+++ b/src/order_cmd.cpp	Fri May 02 08:15:36 2008 +0000
@@ -1781,6 +1781,7 @@
 {
 	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));