--- a/aircraft_cmd.c	Sun Mar 20 00:32:26 2005 +0000
+++ b/aircraft_cmd.c	Sun Mar 20 08:43:29 2005 +0000
@@ -575,7 +575,7 @@
 		return;
 
 	if (v->current_order.type == OT_GOTO_DEPOT &&
-			v->current_order.flags & OF_FULL_LOAD)
+			v->current_order.flags & OF_HALT_IN_DEPOT)
 		return;
 
 	if (_patches.gotodepot && VehicleHasDepotOrders(v))
@@ -1313,9 +1313,9 @@
 		v->current_order.type = OT_NOTHING;
 		v->current_order.flags = 0;
 
-		if (old_order.flags & OF_UNLOAD) {
+		if (HASBIT(old_order.flags, OFB_PART_OF_ORDERS)) {
 			v->cur_order_index++;
-		} else if (old_order.flags & OF_FULL_LOAD) { // force depot visit
+		} else if (HASBIT(old_order.flags, OFB_HALT_IN_DEPOT)) { // force depot visit
 			v->vehstatus |= VS_STOPPED;
 			InvalidateWindowClasses(WC_AIRCRAFT_LIST);