diff options
| author | truebrain <truebrain@openttd.org> | 2009-01-16 00:05:26 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2009-01-16 00:05:26 +0000 |
| commit | 94dd36d1eceb487616f9f0ea260fbe00d84cc267 (patch) | |
| tree | 9e3c6b823cc8e282db94a22336d126affeaaac1c /src/ai/api/ai_order.cpp | |
| parent | 5119132dda807aacb65e2afcce22665e7eedc577 (diff) | |
| download | openttd-94dd36d1eceb487616f9f0ea260fbe00d84cc267.tar.xz | |
(svn r15101) -Change [API CHANGE]: more consistant naming for consts:
INVALID_TOWN_RATING -> TOWN_RATING_INVALID
INVALID_TRANSPORT -> TRANSPORT_INVALID
INVALID_ORDER -> ORDER_INVALID
INVALID_GROUP -> GROUP_INVALID
GROUP_ALL/DEFAULT -> ALL/DEFAULT_GROUP
VEHICLE_RAIL/ROAD/.. -> VT_RAIL/ROAD/..
MY_COMPANY -> COMPANY_SELF
FIRST/LAST/INVALID_COMPANY -> COMPANY_FIRST/LAST/INVALID
Diffstat (limited to 'src/ai/api/ai_order.cpp')
| -rw-r--r-- | src/ai/api/ai_order.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp index f48c5e392..1f30688e4 100644 --- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -45,15 +45,15 @@ static OrderType GetOrderTypeByTile(TileIndex t) /* static */ bool AIOrder::IsValidVehicleOrder(VehicleID vehicle_id, OrderPosition order_position) { - return AIVehicle::IsValidVehicle(vehicle_id) && order_position >= 0 && (order_position < ::GetVehicle(vehicle_id)->GetNumOrders() || order_position == CURRENT_ORDER); + return AIVehicle::IsValidVehicle(vehicle_id) && order_position >= 0 && (order_position < ::GetVehicle(vehicle_id)->GetNumOrders() || order_position == ORDER_CURRENT); } /* static */ AIOrder::OrderPosition AIOrder::ResolveOrderPosition(VehicleID vehicle_id, OrderPosition order_position) { - if (!AIVehicle::IsValidVehicle(vehicle_id)) return INVALID_ORDER; + if (!AIVehicle::IsValidVehicle(vehicle_id)) return ORDER_INVALID; - if (order_position == CURRENT_ORDER) return (AIOrder::OrderPosition)::GetVehicle(vehicle_id)->cur_order_index; - return (order_position >= 0 && order_position < ::GetVehicle(vehicle_id)->GetNumOrders()) ? order_position : INVALID_ORDER; + if (order_position == ORDER_CURRENT) return (AIOrder::OrderPosition)::GetVehicle(vehicle_id)->cur_order_index; + return (order_position >= 0 && order_position < ::GetVehicle(vehicle_id)->GetNumOrders()) ? order_position : ORDER_INVALID; } @@ -87,7 +87,7 @@ static OrderType GetOrderTypeByTile(TileIndex t) const Order *order; const Vehicle *v = ::GetVehicle(vehicle_id); - if (order_position == CURRENT_ORDER) { + if (order_position == ORDER_CURRENT) { order = &v->current_order; } else { order = v->GetFirstOrder(); @@ -110,7 +110,7 @@ static OrderType GetOrderTypeByTile(TileIndex t) if (!IsValidVehicleOrder(vehicle_id, order_position)) return AIOF_INVALID; const Order *order; - if (order_position == CURRENT_ORDER) { + if (order_position == ORDER_CURRENT) { order = &::GetVehicle(vehicle_id)->current_order; } else { order = ::GetVehicle(vehicle_id)->GetFirstOrder(); @@ -144,7 +144,7 @@ static OrderType GetOrderTypeByTile(TileIndex t) /* static */ bool AIOrder::InsertOrder(VehicleID vehicle_id, OrderPosition order_position, TileIndex destination, AIOrder::AIOrderFlags order_flags) { /* IsValidVehicleOrder is not good enough because it does not allow appending. */ - if (order_position == CURRENT_ORDER) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position); + if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position); EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id)); EnforcePrecondition(false, order_position >= 0 && order_position <= ::GetVehicle(vehicle_id)->GetNumOrders()); |