Mercurial > hg > openttd

changeset 14868:9ae8ffb9d4b9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19464) -Codechange: move GetHangarTile to Airport
author yexo <yexo@openttd.org>
date Fri, 19 Mar 2010 09:58:46 +0000
parents d2be152e6d09
children bb2bddd14746
files src/ai/api/ai_airport.cpp src/ai/api/ai_depotlist.cpp src/ai/api/ai_order.cpp src/airport.cpp src/station_base.h src/station_cmd.cpp
diffstat 6 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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 st->GetHangarTile(0);
+	return st->airport.GetHangarTile(0);
 }
 
 /* static */ AIAirport::AirportType AIAirport::GetAirportType(TileIndex tile)
--- a/src/ai/api/ai_depotlist.cpp
+++ b/src/ai/api/ai_depotlist.cpp
@@ -31,7 +31,7 @@
 				if (st->owner == ::_current_company) {
 					const AirportSpec *as = st->airport.GetSpec();
 					for (uint i = 0; i < as->nof_depots; i++) {
-						this->AddItem(st->GetHangarTile(i));
+						this->AddItem(st->airport.GetHangarTile(i));
 					}
 				}
 			}
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -182,7 +182,7 @@
 			/* Aircraft's hangars are referenced by StationID, not DepotID */
 			const Station *st = ::Station::Get(order->GetDestination());
 			if (!st->airport.HasHangar()) return INVALID_TILE;
-			return st->GetHangarTile(0);
+			return st->airport.GetHangarTile(0);
 		}
 
 		case OT_GOTO_STATION: {
--- a/src/airport.cpp
+++ b/src/airport.cpp
@@ -397,7 +397,7 @@
 	 * layout for #th position of depot. Since layout must start with a listing
 	 * of all depots, it is simple */
 	for (uint i = 0;; i++) {
-		if (st->GetHangarTile(i) == hangar_tile) {
+		if (st->airport.GetHangarTile(i) == hangar_tile) {
 			assert(apc->layout[i].heading == HANGAR);
 			return apc->layout[i].position;
 		}
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -67,6 +67,13 @@
 	{
 		return this->GetSpec()->nof_depots > 0;
 	}
+
+	FORCEINLINE TileIndex GetHangarTile(uint hangar_num) const
+	{
+		assert(this->tile != INVALID_TILE);
+		assert(hangar_num < this->GetSpec()->nof_depots);
+		return this->tile + ToTileIndexDiff(this->GetSpec()->depot_table[hangar_num]);
+	}
 };
 
 typedef SmallVector<Industry *, 2> IndustryVector;
@@ -135,13 +142,6 @@
 		return IsAirportTile(tile) && GetStationIndex(tile) == this->index;
 	}
 
-	FORCEINLINE TileIndex GetHangarTile(uint hangar_num) const
-	{
-		assert(this->airport.tile != INVALID_TILE);
-		assert(hangar_num < this->airport.GetSpec()->nof_depots);
-		return this->airport.tile + ToTileIndexDiff(this->airport.GetSpec()->depot_table[hangar_num]);
-	}
-
 	/* virtual */ uint32 GetNewGRFVariable(const ResolverObject *object, byte variable, byte parameter, bool *available) const;
 
 	/* virtual */ void GetTileArea(TileArea *ta, StationType type) const;
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -69,7 +69,7 @@
 	const AirportSpec *as = st->airport.GetSpec();
 
 	for (uint i = 0; i < as->nof_depots; i++) {
-		if (st->GetHangarTile(i) == t) return true;
+		if (st->airport.GetHangarTile(i) == t) return true;
 	}
 
 	return false;
@@ -2296,7 +2296,7 @@
 		const AirportSpec *as = st->airport.GetSpec();
 		for (uint i = 0; i < as->nof_depots; ++i) {
 			DeleteWindowById(
-				WC_VEHICLE_DEPOT, st->GetHangarTile(i)
+				WC_VEHICLE_DEPOT, st->airport.GetHangarTile(i)
 			);
 		}