--- a/aircraft_cmd.c	Fri Feb 10 06:03:51 2006 +0000
+++ b/aircraft_cmd.c	Fri Feb 10 06:33:56 2006 +0000
@@ -1043,20 +1043,18 @@
 {
 	const Order *order;
 
-	// OT_GOTO_DEPOT, OT_LOADING
-	if (v->current_order.type == OT_GOTO_DEPOT ||
-			v->current_order.type == OT_LOADING) {
-		if (v->current_order.type != OT_GOTO_DEPOT ||
-				!(v->current_order.flags & OF_UNLOAD))
-			return;
+	switch (v->current_order.type) {
+		case OT_GOTO_DEPOT:
+			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
+			if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
+					!VehicleNeedsService(v)) {
+				v->cur_order_index++;
+			}
+			break;
+
+		case OT_LOADING: return;
 	}
 
-	if (v->current_order.type == OT_GOTO_DEPOT &&
-			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
- 			!VehicleNeedsService(v)) {
-			v->cur_order_index++;
-		}
-
 	if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
 
 	order = GetVehicleOrder(v, v->cur_order_index);
@@ -1067,8 +1065,7 @@
 		return;
 	}
 
-	if (order->type == OT_DUMMY && !CheckForValidOrders(v))
-		CrashAirplane(v);
+	if (order->type == OT_DUMMY && !CheckForValidOrders(v)) CrashAirplane(v);
 
 	if (order->type    == v->current_order.type   &&
 			order->flags   == v->current_order.flags  &&

--- a/ship_cmd.c	Fri Feb 10 06:03:51 2006 +0000
+++ b/ship_cmd.c	Fri Feb 10 06:33:56 2006 +0000
@@ -203,22 +203,21 @@
 {
 	const Order *order;
 
-	if (v->current_order.type >= OT_GOTO_DEPOT &&
-			v->current_order.type <= OT_LEAVESTATION) {
-		if (v->current_order.type != OT_GOTO_DEPOT ||
-				!(v->current_order.flags & OF_UNLOAD))
+	switch (v->current_order.type) {
+		case OT_GOTO_DEPOT:
+			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
+			if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
+					!VehicleNeedsService(v)) {
+				v->cur_order_index++;
+			}
+			break;
+
+		case OT_LOADING:
+		case OT_LEAVESTATION:
 			return;
 	}
 
-	if (v->current_order.type == OT_GOTO_DEPOT &&
-			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) == (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
-			!VehicleNeedsService(v)) {
-		v->cur_order_index++;
-	}
-
-
-	if (v->cur_order_index >= v->num_orders)
-		v->cur_order_index = 0;
+	if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
 
 	order = GetVehicleOrder(v, v->cur_order_index);
 

--- a/train_cmd.c	Fri Feb 10 06:03:51 2006 +0000
+++ b/train_cmd.c	Fri Feb 10 06:33:56 2006 +0000
@@ -2274,21 +2274,20 @@
 	const Order *order;
 	bool result;
 
-	// These are un-interruptible
-	if (v->current_order.type >= OT_GOTO_DEPOT &&
-			v->current_order.type <= OT_LEAVESTATION) {
-		// Let a depot order in the orderlist interrupt.
-		if (v->current_order.type != OT_GOTO_DEPOT ||
-				!(v->current_order.flags & OF_UNLOAD))
+	switch (v->current_order.type) {
+		case OT_GOTO_DEPOT:
+			if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return false;
+			if ((v->current_order.flags & OF_SERVICE_IF_NEEDED) &&
+					!VehicleNeedsService(v)) {
+				v->cur_order_index++;
+			}
+			break;
+
+		case OT_LOADING:
+		case OT_LEAVESTATION:
 			return false;
 	}
 
-	if (v->current_order.type == OT_GOTO_DEPOT &&
-			(v->current_order.flags & (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED)) ==  (OF_PART_OF_ORDERS | OF_SERVICE_IF_NEEDED) &&
-			!VehicleNeedsService(v)) {
-		v->cur_order_index++;
-	}
-
 	// check if we've reached the waypoint?
 	if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) {
 		v->cur_order_index++;