cpp/openttd-patchpack/source Changeset - r14858:9dcf234fd548

Changeset - r14858:9dcf234fd548

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

yexo - 14 years ago 2010-03-19 09:58:46
yexo@openttd.org

(svn r19464) -Codechange: move GetHangarTile to Airport

6 files changed with 13 insertions and 13 deletions:

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

0 comments (0 inline, 0 general)

src/ai/api/ai_airport.cpp

➞

Show inline comments

@@ @@ -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)

src/ai/api/ai_depotlist.cpp

➞

Show inline comments

@@ @@ -31,7 +31,7 @@ AIDepotList::AIDepotList(AITile::Transpo @@
 				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));
+					}
+				}
+			}

src/ai/api/ai_order.cpp

➞

Show inline comments

@@ @@ -182,7 +182,7 @@ static const Order *ResolveOrder(Vehicle @@
 			/* 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: {

src/airport.cpp

➞

Show inline comments

@@ @@ -397,7 +397,7 @@ byte GetVehiclePosOnBuild(TileIndex hang @@
 	 * 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;
+		}

src/station_base.h

➞

Show inline comments

@@ @@ -67,6 +67,13 @@ struct Airport : public TileArea { @@
+	{
 		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 @@ public: @@
 		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;

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -69,7 +69,7 @@ bool IsHangar(TileIndex t) @@
 	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 @@ static CommandCost RemoveAirport(TileInd @@
 		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)
 			);
+		}

0 comments (0 inline, 0 general)