--- a/src/ai/api/ai_order.cpp	Tue Apr 08 11:54:53 2008 +0000
+++ b/src/ai/api/ai_order.cpp	Sat Apr 12 21:38:49 2008 +0000
@@ -84,16 +84,16 @@
 	for (uint i = 0; i < order_id; i++) order = order->next;
 
 	AIOrderFlags order_flags= AIOF_NONE;
-	if (order->GetNonStopType() != OFB_NO_NON_STOP) order_flags |= AIOF_NON_STOP;
+	if (order->GetNonStopType() != ONSF_STOP_EVERYWHERE) order_flags |= AIOF_NON_STOP;
 	switch (order->GetType()) {
 		case OT_GOTO_DEPOT:
-			if (order->GetDepotOrderType() & OFB_SERVICE_IF_NEEDED) order_flags |= AIOF_SERVICE_IF_NEEDED;
+			if (order->GetDepotOrderType() & ODTFB_SERVICE) order_flags |= AIOF_SERVICE_IF_NEEDED;
 			break;
 
 		case OT_GOTO_STATION:
-			if (order->GetLoadType()   & OFB_FULL_LOAD) order_flags |= AIOF_FULL_LOAD;
-			if (order->GetUnloadType() & OFB_UNLOAD)    order_flags |= AIOF_UNLOAD;
-			if (order->GetUnloadType() & OFB_TRANSFER)  order_flags |= AIOF_TRANSFER;
+			if (order->GetLoadType()   & OLFB_FULL_LOAD) order_flags |= AIOF_FULL_LOAD;
+			if (order->GetUnloadType() & OUFB_UNLOAD)    order_flags |= AIOF_UNLOAD;
+			if (order->GetUnloadType() & OUFB_TRANSFER)  order_flags |= AIOF_TRANSFER;
 			break;
 
 		default: break;
@@ -118,14 +118,14 @@
 	Order order;
 	switch (::GetOrderTypeByTile(destination)) {
 		case OT_GOTO_DEPOT:
-			order.MakeGoToDepot(::GetDepotByTile(destination)->index, true);
-			if (order_flags & AIOF_SERVICE_IF_NEEDED) order.SetDepotOrderType(OFB_SERVICE_IF_NEEDED);
+			order.MakeGoToDepot(::GetDepotByTile(destination)->index, ODTFB_PART_OF_ORDERS);
+			if (order_flags & AIOF_SERVICE_IF_NEEDED) order.SetDepotOrderType(ODTFB_SERVICE);
 			break;
 
 		case OT_GOTO_STATION:
 			order.MakeGoToStation(::GetStationIndex(destination));
-			if (order_flags & AIOF_FULL_LOAD) order.SetLoadType(OFB_FULL_LOAD);
-			order.SetUnloadType(((order_flags & AIOF_TRANSFER) ? OFB_TRANSFER : 0) | ((order_flags & AIOF_UNLOAD) ? OFB_UNLOAD : 0));
+			if (order_flags & AIOF_FULL_LOAD) order.SetLoadType(OLFB_FULL_LOAD);
+			order.SetUnloadType((OrderUnloadFlags)(((order_flags & AIOF_TRANSFER) ? OUFB_TRANSFER : 0) | ((order_flags & AIOF_UNLOAD) ? OUFB_UNLOAD : 0)));
 			break;
 
 		case OT_GOTO_WAYPOINT:
@@ -136,7 +136,7 @@
 			return false;
 	}
 
-	if (order_flags & AIOF_NON_STOP) order.SetNonStopType(OFB_NON_STOP);
+	if (order_flags & AIOF_NON_STOP) order.SetNonStopType(ONSF_NO_STOP_AT_DESTINATION_STATION);
 
 	return AIObject::DoCommand(0, vehicle_id | (order_id << 16), order.Pack(), CMD_INSERT_ORDER);
 }