Mercurial > hg > openttd

changeset 17072:22f02928bc1b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21809) -Fix [FS#4404]: remove unreached automatic orders as well when reaching an ordered waypoint or depot (fonsinchen)
author rubidium <rubidium@openttd.org>
date Sat, 15 Jan 2011 18:19:04 +0000
parents cef968e48b30
children 80b189c7103e
files src/order_cmd.cpp src/vehicle.cpp
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -1733,6 +1733,7 @@
 	if (((v->current_order.IsType(OT_GOTO_STATION) && (v->current_order.GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) || v->current_order.IsType(OT_GOTO_WAYPOINT)) &&
 			IsTileType(v->tile, MP_STATION) &&
 			v->current_order.GetDestination() == GetStationIndex(v->tile)) {
+		v->DeleteUnreachedAutoOrders();
 		/* We set the last visited station here because we do not want
 		 * the train to stop at this 'via' station if the next order
 		 * is a no-non-stop order; in that case not setting the last
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -1265,6 +1265,7 @@
 
 		if (t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) {
 			/* Part of orders */
+			v->DeleteUnreachedAutoOrders();
 			UpdateVehicleTimetable(v, true);
 			v->IncrementOrderIndex();
 		}