summaryrefslogtreecommitdiff
path: root/src/ai/api
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2010-01-18 14:32:47 +0000
committeryexo <yexo@openttd.org>2010-01-18 14:32:47 +0000
commita1f28ec88bf3987236fb1b9df9c9dbe8c68419b7 (patch)
tree1fe3a4233e91327653fa7aab2bb766aa187d0909 /src/ai/api
parent565ad802b11f5ceab8e354a3c6aaf530998529d1 (diff)
downloadopenttd-a1f28ec88bf3987236fb1b9df9c9dbe8c68419b7.tar.xz
(svn r18860) -Codechange: introduce a wrapper to get an hangar tile from a station
Diffstat (limited to 'src/ai/api')
-rw-r--r--src/ai/api/ai_airport.cpp2
-rw-r--r--src/ai/api/ai_depotlist.cpp2
-rw-r--r--src/ai/api/ai_order.cpp5
3 files changed, 4 insertions, 5 deletions
diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp
index b966bc542..ce30782cb 100644
--- a/src/ai/api/ai_airport.cpp
+++ b/src/ai/api/ai_airport.cpp
@@ -109,7 +109,7 @@
if (st->owner != _current_company) return INVALID_TILE;
if ((st->facilities & FACIL_AIRPORT) == 0) return INVALID_TILE;
- return ::ToTileIndexDiff(st->GetAirportSpec()->depot_table[0]) + st->airport_tile;
+ return st->GetHangarTile(0);
}
/* static */ AIAirport::AirportType AIAirport::GetAirportType(TileIndex tile)
diff --git a/src/ai/api/ai_depotlist.cpp b/src/ai/api/ai_depotlist.cpp
index 1dc68fb7b..a40c13a31 100644
--- a/src/ai/api/ai_depotlist.cpp
+++ b/src/ai/api/ai_depotlist.cpp
@@ -31,7 +31,7 @@ AIDepotList::AIDepotList(AITile::TransportType transport_type)
if (st->owner == ::_current_company) {
const AirportSpec *as = st->GetAirportSpec();
for (uint i = 0; i < as->nof_depots; i++) {
- this->AddItem(st->airport_tile + ToTileIndexDiff(as->depot_table[i]));
+ this->AddItem(st->GetHangarTile(i));
}
}
}
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 9cde814d8..b6280be1f 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -181,9 +181,8 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
if (v->type != VEH_AIRCRAFT) return ::Depot::Get(order->GetDestination())->xy;
/* Aircraft's hangars are referenced by StationID, not DepotID */
const Station *st = ::Station::Get(order->GetDestination());
- const AirportSpec *as = st->GetAirportSpec();
- if (as == NULL || as->nof_depots == 0) return INVALID_TILE;
- return st->airport_tile + ::ToTileIndexDiff(as->depot_table[0]);
+ if (st->GetAirportSpec()->nof_depots == 0) return INVALID_TILE;
+ return st->GetHangarTile(0);
}
case OT_GOTO_STATION: {