cpp/openttd-patchpack/source Changeset - r17702:bc20a4f6c920

Changeset - r17702:bc20a4f6c920

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 13 years ago 2011-05-25 20:10:02
frosch@openttd.org

(svn r22492) -Fix [FS#4624] (r21642, r22328): Only try to insert implicit orders for ground vehicles. Aircraft may reach unscheduled terminals when skippnig orders etc.

1 file changed with 5 insertions and 5 deletions:

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1854,16 +1854,16 @@ void Vehicle::BeginLoading() @@
 		this->current_order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION);
 	} else {
 		assert(this->IsGroundVehicle());
 		bool suppress_implicit_orders = HasBit(this->GetGroundVehicleFlags(), GVF_SUPPRESS_IMPLICIT_ORDERS);
 		/* We weren't scheduled to stop here. Insert an implicit order
 		 * to show that we are stopping here, but only do that if the order
 		 * list isn't empty. */
 		 * list isn't empty.
 		 * While only groundvehicles have implicit orders, e.g. aircraft might still enter
 		 * the 'wrong' terminal when skipping orders etc. */
 		Order *in_list = this->GetOrder(this->cur_implicit_order_index);
 		if (in_list != NULL &&
+		if (this->IsGroundVehicle() && in_list != NULL &&
 				(!in_list->IsType(OT_IMPLICIT) ||
 				in_list->GetDestination() != this->last_station_visited)) {
 			bool suppress_implicit_orders = HasBit(this->GetGroundVehicleFlags(), GVF_SUPPRESS_IMPLICIT_ORDERS);
 			/* Do not create consecutive duplicates of implicit orders */
 			Order *prev_order = this->cur_implicit_order_index > 0 ? this->GetOrder(this->cur_implicit_order_index - 1) : NULL;
 			if (prev_order == NULL ||

0 comments (0 inline, 0 general)