Changeset - r12221:ff582fb76dde
[Not reviewed]
master
0 13 0
smatz - 15 years ago 2009-06-24 19:26:41
smatz@openttd.org
(svn r16646) -Codechange: rename GetDepotByTile() to Depot::GetByTile()
13 files changed with 21 insertions and 21 deletions:
0 comments (0 inline, 0 general)
src/ai/api/ai_order.cpp
Show inline comments
 
@@ -342,13 +342,13 @@ static const Order *ResolveOrder(Vehicle
 
			 * to a depot (other vehicle types). */
 
			if (::Vehicle::Get(vehicle_id)->type == VEH_AIRCRAFT) {
 
				if (!::IsTileType(destination, MP_STATION)) return false;
 
				order.MakeGoToDepot(::GetStationIndex(destination), odtf, onsf, odaf);
 
			} else {
 
				if (::IsTileType(destination, MP_STATION)) return false;
 
				order.MakeGoToDepot(::GetDepotByTile(destination)->index, odtf, onsf, odaf);
 
				order.MakeGoToDepot(::Depot::GetByTile(destination)->index, odtf, onsf, odaf);
 
			}
 
			break;
 
		}
 

	
 
		case OT_GOTO_STATION:
 
			order.MakeGoToStation(::GetStationIndex(destination));
src/depot.cpp
Show inline comments
 
@@ -14,16 +14,16 @@
 

	
 
DepotPool _depot_pool("Depot");
 
INSTANTIATE_POOL_METHODS(Depot)
 

	
 
/**
 
 * Gets a depot from a tile
 
 *
 
 * @param tile tile with depot
 
 * @return Returns the depot if the tile had a depot, else it returns NULL
 
 */
 
Depot *GetDepotByTile(TileIndex tile)
 
/* static */ Depot *Depot::GetByTile(TileIndex tile)
 
{
 
	/* A ship depot is multiple tiles. The north most tile is
 
	 * always the ->xy tile, so make sure we always look for
 
	 * the nothern tile and not the southern one. */
 
	if (IsShipDepotTile(tile)) {
 
		tile = min(tile, GetOtherShipDepotTile(tile));
src/depot_base.h
Show inline comments
 
@@ -16,14 +16,14 @@ extern DepotPool _depot_pool;
 
struct Depot : DepotPool::PoolItem<&_depot_pool> {
 
	TileIndex xy;
 
	TownID town_index;
 

	
 
	Depot(TileIndex xy = INVALID_TILE) : xy(xy) {}
 
	~Depot();
 

	
 
	static Depot *GetByTile(TileIndex tile);
 
};
 

	
 
Depot *GetDepotByTile(TileIndex tile);
 

	
 
#define FOR_ALL_DEPOTS_FROM(var, start) FOR_ALL_ITEMS_FROM(Depot, depot_index, var, start)
 
#define FOR_ALL_DEPOTS(var) FOR_ALL_DEPOTS_FROM(var, 0)
 

	
 
#endif /* DEPOT_BASE_H */
src/depot_gui.cpp
Show inline comments
 
@@ -338,13 +338,13 @@ struct DepotWindow : Window {
 
		}
 

	
 
		/* locate the depot struct */
 
		if (this->type == VEH_AIRCRAFT) {
 
			SetDParam(0, GetStationIndex(tile)); // Airport name
 
		} else {
 
			Depot *depot = GetDepotByTile(tile);
 
			Depot *depot = Depot::GetByTile(tile);
 
			assert(depot != NULL);
 

	
 
			SetDParam(0, depot->town_index);
 
		}
 

	
 
		w->DrawWidgets();
 
@@ -812,13 +812,13 @@ struct DepotWindow : Window {
 
						STR_DEPOT_SHIP_CAPTION,
 
						STR_DEPOT_AIRCRAFT_CAPTION
 
					};
 
					TileIndex tile = this->window_number;
 
					byte vehtype = this->type;
 

	
 
					SetDParam(0, (vehtype == VEH_AIRCRAFT) ? GetStationIndex(tile) : GetDepotByTile(tile)->town_index);
 
					SetDParam(0, (vehtype == VEH_AIRCRAFT) ? GetStationIndex(tile) : Depot::GetByTile(tile)->town_index);
 
					ShowQuery(
 
						confirm_captions[vehtype],
 
						STR_DEPOT_SELL_CONFIRMATION_TEXT,
 
						this,
 
						DepotSellAllConfirmationCallback
 
					);
src/order_gui.cpp
Show inline comments
 
@@ -297,23 +297,23 @@ static Order GetOrderCmdFromTile(const V
 
	/* check depot first */
 
	if (_settings_game.order.gotodepot) {
 
		switch (GetTileType(tile)) {
 
			case MP_RAILWAY:
 
				if (v->type == VEH_TRAIN && IsTileOwner(tile, _local_company)) {
 
					if (IsRailDepot(tile)) {
 
						order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS,
 
						order.MakeGoToDepot(Depot::GetByTile(tile)->index, ODTFB_PART_OF_ORDERS,
 
								_settings_client.gui.new_nonstop ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE);
 
						if (_ctrl_pressed) order.SetDepotOrderType((OrderDepotTypeFlags)(order.GetDepotOrderType() ^ ODTFB_SERVICE));
 
						return order;
 
					}
 
				}
 
				break;
 

	
 
			case MP_ROAD:
 
				if (IsRoadDepot(tile) && v->type == VEH_ROAD && IsTileOwner(tile, _local_company)) {
 
					order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS,
 
					order.MakeGoToDepot(Depot::GetByTile(tile)->index, ODTFB_PART_OF_ORDERS,
 
							_settings_client.gui.new_nonstop ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE);
 
					if (_ctrl_pressed) order.SetDepotOrderType((OrderDepotTypeFlags)(order.GetDepotOrderType() ^ ODTFB_SERVICE));
 
					return order;
 
				}
 
				break;
 

	
 
@@ -328,13 +328,13 @@ static Order GetOrderCmdFromTile(const V
 

	
 
			case MP_WATER:
 
				if (v->type != VEH_SHIP) break;
 
				if (IsShipDepot(tile) && IsTileOwner(tile, _local_company)) {
 
					TileIndex tile2 = GetOtherShipDepotTile(tile);
 

	
 
					order.MakeGoToDepot(GetDepotByTile(tile < tile2 ? tile : tile2)->index, ODTFB_PART_OF_ORDERS, ONSF_STOP_EVERYWHERE);
 
					order.MakeGoToDepot(Depot::GetByTile(tile < tile2 ? tile : tile2)->index, ODTFB_PART_OF_ORDERS, ONSF_STOP_EVERYWHERE);
 
					if (_ctrl_pressed) order.SetDepotOrderType((OrderDepotTypeFlags)(order.GetDepotOrderType() ^ ODTFB_SERVICE));
 
					return order;
 
				}
 

	
 
			default:
 
				break;
src/rail_cmd.cpp
Show inline comments
 
@@ -1438,13 +1438,13 @@ static CommandCost RemoveTrainDepot(Tile
 
		if (GetDepotWaypointReservation(tile)) {
 
			v = GetTrainForReservation(tile, DiagDirToDiagTrack(dir));
 
			if (v != NULL) FreeTrainTrackReservation(v);
 
		}
 

	
 
		DoClearSquare(tile);
 
		delete GetDepotByTile(tile);
 
		delete Depot::GetByTile(tile);
 
		AddSideToSignalBuffer(tile, dir, owner);
 
		YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir));
 
		if (v != NULL) TryPathReserve(v, true);
 
	}
 

	
 
	return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_train_depot);
src/road_cmd.cpp
Show inline comments
 
@@ -879,13 +879,13 @@ static CommandCost RemoveRoadDepot(TileI
 
	if (!CheckTileOwnership(tile) && _current_company != OWNER_WATER) return CMD_ERROR;
 

	
 
	if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 

	
 
	if (flags & DC_EXEC) {
 
		DoClearSquare(tile);
 
		delete GetDepotByTile(tile);
 
		delete Depot::GetByTile(tile);
 
	}
 

	
 
	return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_road_depot);
 
}
 

	
 
static CommandCost ClearTile_Road(TileIndex tile, DoCommandFlag flags)
src/roadveh_cmd.cpp
Show inline comments
 
@@ -371,13 +371,13 @@ static const Depot *FindClosestRoadDepot
 
		case VPF_NPF: { // NPF
 
			/* See where we are now */
 
			Trackdir trackdir = v->GetVehicleTrackdir();
 

	
 
			NPFFoundTargetData ftd = NPFRouteToDepotBreadthFirstTwoWay(v->tile, trackdir, false, v->tile, ReverseTrackdir(trackdir), false, TRANSPORT_ROAD, v->compatible_roadtypes, v->owner, INVALID_RAILTYPES, 0);
 

	
 
			if (ftd.best_bird_dist == 0) return GetDepotByTile(ftd.node.tile); // Target found
 
			if (ftd.best_bird_dist == 0) return Depot::GetByTile(ftd.node.tile); // Target found
 
		} break;
 

	
 
		default:
 
		case VPF_OPF: { // OPF
 
			RoadFindDepotData rfdd;
 

	
 
@@ -386,13 +386,13 @@ static const Depot *FindClosestRoadDepot
 

	
 
			/* search in all directions */
 
			for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 
				FollowTrack(v->tile, PATHFIND_FLAGS_NONE, TRANSPORT_ROAD, v->compatible_roadtypes, d, EnumRoadSignalFindDepot, NULL, &rfdd);
 
			}
 

	
 
			if (rfdd.best_length != UINT_MAX) return GetDepotByTile(rfdd.tile);
 
			if (rfdd.best_length != UINT_MAX) return Depot::GetByTile(rfdd.tile);
 
		} break;
 
	}
 

	
 
	return NULL; // Target not found
 
}
 

	
src/ship_cmd.cpp
Show inline comments
 
@@ -97,13 +97,13 @@ SpriteID Ship::GetImage(Direction direct
 
static const Depot *FindClosestShipDepot(const Vehicle *v)
 
{
 
	if (_settings_game.pf.pathfinder_for_ships == VPF_NPF) { // NPF is used
 
		Trackdir trackdir = v->GetVehicleTrackdir();
 
		NPFFoundTargetData ftd = NPFRouteToDepotTrialError(v->tile, trackdir, false, TRANSPORT_WATER, 0, v->owner, INVALID_RAILTYPES);
 

	
 
		if (ftd.best_bird_dist == 0) return GetDepotByTile(ftd.node.tile); // Found target
 
		if (ftd.best_bird_dist == 0) return Depot::GetByTile(ftd.node.tile); // Found target
 

	
 
		return NULL; // Did not find target
 
	}
 

	
 
	/* OPF or YAPF - find the closest depot */
 

	
src/train_cmd.cpp
Show inline comments
 
@@ -2228,13 +2228,13 @@ static TrainFindDepotData FindClosestTra
 
bool Train::FindClosestDepot(TileIndex *location, DestinationID *destination, bool *reverse)
 
{
 
	TrainFindDepotData tfdd = FindClosestTrainDepot(this, 0);
 
	if (tfdd.best_length == UINT_MAX) return false;
 

	
 
	if (location    != NULL) *location    = tfdd.tile;
 
	if (destination != NULL) *destination = GetDepotByTile(tfdd.tile)->index;
 
	if (destination != NULL) *destination = Depot::GetByTile(tfdd.tile)->index;
 
	if (reverse     != NULL) *reverse     = tfdd.reverse;
 

	
 
	return true;
 
}
 

	
 
/** Send a train to a depot
 
@@ -4484,13 +4484,13 @@ static void CheckIfTrainNeedsService(Tra
 
			v->current_order.MakeDummy();
 
			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
 
		}
 
		return;
 
	}
 

	
 
	const Depot *depot = GetDepotByTile(tfdd.tile);
 
	const Depot *depot = Depot::GetByTile(tfdd.tile);
 

	
 
	if (v->current_order.IsType(OT_GOTO_DEPOT) &&
 
			v->current_order.GetDestination() != depot->index &&
 
			!Chance16(3, 16)) {
 
		return;
 
	}
src/vehicle_gui.cpp
Show inline comments
 
@@ -1240,13 +1240,13 @@ void ShowVehicleListWindow(CompanyID com
 
{
 
	uint16 depot_airport_index;
 

	
 
	if (vehicle_type == VEH_AIRCRAFT) {
 
		depot_airport_index = GetStationIndex(depot_tile);
 
	} else {
 
		Depot *depot = GetDepotByTile(depot_tile);
 
		Depot *depot = Depot::GetByTile(depot_tile);
 
		if (depot == NULL) return; // no depot to show
 
		depot_airport_index = depot->index;
 
	}
 
	ShowVehicleListWindowLocal(company, VLW_DEPOT_LIST, vehicle_type, depot_airport_index);
 
}
 

	
src/water_cmd.cpp
Show inline comments
 
@@ -174,13 +174,13 @@ static CommandCost RemoveShipDepot(TileI
 
	if (!(flags & DC_BANKRUPT)) {
 
		if (!EnsureNoVehicleOnGround(tile) || !EnsureNoVehicleOnGround(tile2)) return CMD_ERROR;
 
	}
 

	
 
	if (flags & DC_EXEC) {
 
		/* Kill the depot, which is registered at the northernmost tile. Use that one */
 
		delete GetDepotByTile(tile2 < tile ? tile2 : tile);
 
		delete Depot::GetByTile(tile2 < tile ? tile2 : tile);
 

	
 
		MakeWaterKeepingClass(tile,  GetTileOwner(tile));
 
		MakeWaterKeepingClass(tile2, GetTileOwner(tile2));
 
		MarkTileDirtyByTile(tile);
 
		MarkTileDirtyByTile(tile2);
 
	}
src/yapf/yapf_road.cpp
Show inline comments
 
@@ -400,13 +400,13 @@ public:
 

	
 
		/* some path found
 
		 * get found depot tile */
 
		Node *n = Yapf().GetBestNode();
 
		TileIndex depot_tile = n->m_segment_last_tile;
 
		assert(IsRoadDepotTile(depot_tile));
 
		Depot *ret = GetDepotByTile(depot_tile);
 
		Depot *ret = Depot::GetByTile(depot_tile);
 
		return ret;
 
	}
 
};
 

	
 
template <class Tpf_, class Tnode_list, template <class Types> class Tdestination>
 
struct CYapfRoad_TypesT
 
@@ -475,13 +475,13 @@ Depot *YapfFindNearestRoadDepot(const Ve
 
		return NULL;
 
	}
 

	
 
	/* handle the case when our vehicle is already in the depot tile */
 
	if (IsRoadDepotTile(tile)) {
 
		/* only what we need to return is the Depot* */
 
		return GetDepotByTile(tile);
 
		return Depot::GetByTile(tile);
 
	}
 

	
 
	/* default is YAPF type 2 */
 
	typedef Depot *(*PfnFindNearestDepot)(const Vehicle*, TileIndex, Trackdir);
 
	PfnFindNearestDepot pfnFindNearestDepot = &CYapfRoadAnyDepot2::stFindNearestDepot;
 

	
0 comments (0 inline, 0 general)