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_bridge.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_bridge.cpp')
| -rw-r--r-- | src/ai/api/ai_bridge.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ai/api/ai_bridge.cpp b/src/ai/api/ai_bridge.cpp index 86eb5f6f1..56fe7061b 100644 --- a/src/ai/api/ai_bridge.cpp +++ b/src/ai/api/ai_bridge.cpp @@ -56,27 +56,27 @@ static void _DoCommandReturnBuildBridge1(class AIInstance *instance) EnforcePrecondition(false, start != end); EnforcePrecondition(false, ::IsValidTile(start) && ::IsValidTile(end)); EnforcePrecondition(false, TileX(start) == TileX(end) || TileY(start) == TileY(end)); - EnforcePrecondition(false, vehicle_type == AIVehicle::VEHICLE_ROAD || vehicle_type == AIVehicle::VEHICLE_RAIL || vehicle_type == AIVehicle::VEHICLE_WATER); - EnforcePrecondition(false, vehicle_type != AIVehicle::VEHICLE_RAIL || AIRail::IsRailTypeAvailable(AIRail::GetCurrentRailType())); + EnforcePrecondition(false, vehicle_type == AIVehicle::VT_ROAD || vehicle_type == AIVehicle::VT_RAIL || vehicle_type == AIVehicle::VT_WATER); + EnforcePrecondition(false, vehicle_type != AIVehicle::VT_RAIL || AIRail::IsRailTypeAvailable(AIRail::GetCurrentRailType())); uint type = 0; switch (vehicle_type) { - case AIVehicle::VEHICLE_ROAD: + case AIVehicle::VT_ROAD: type |= (TRANSPORT_ROAD << 15); type |= (RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType()) << 8); break; - case AIVehicle::VEHICLE_RAIL: + case AIVehicle::VT_RAIL: type |= (TRANSPORT_RAIL << 15); type |= (AIRail::GetCurrentRailType() << 8); break; - case AIVehicle::VEHICLE_WATER: + case AIVehicle::VT_WATER: type |= (TRANSPORT_WATER << 15); break; default: NOT_REACHED(); } /* For rail and water we do nothing special */ - if (vehicle_type == AIVehicle::VEHICLE_RAIL || vehicle_type == AIVehicle::VEHICLE_WATER) { + if (vehicle_type == AIVehicle::VT_RAIL || vehicle_type == AIVehicle::VT_WATER) { return AIObject::DoCommand(end, start, type | bridge_id, CMD_BUILD_BRIDGE); } |