summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ai/api/ai_order.cpp2
-rw-r--r--src/depot.cpp4
-rw-r--r--src/depot_base.h4
-rw-r--r--src/depot_gui.cpp4
-rw-r--r--src/order_gui.cpp6
-rw-r--r--src/rail_cmd.cpp2
-rw-r--r--src/road_cmd.cpp2
-rw-r--r--src/roadveh_cmd.cpp4
-rw-r--r--src/ship_cmd.cpp2
-rw-r--r--src/train_cmd.cpp4
-rw-r--r--src/vehicle_gui.cpp2
-rw-r--r--src/water_cmd.cpp2
-rw-r--r--src/yapf/yapf_road.cpp4
13 files changed, 21 insertions, 21 deletions
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index 545d336e3..1378b9ea9 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -345,7 +345,7 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
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;
}
diff --git a/src/depot.cpp b/src/depot.cpp
index d241caf72..0f21dc710 100644
--- a/src/depot.cpp
+++ b/src/depot.cpp
@@ -17,10 +17,10 @@ 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
diff --git a/src/depot_base.h b/src/depot_base.h
index f8c7270e8..9fa38fea7 100644
--- a/src/depot_base.h
+++ b/src/depot_base.h
@@ -19,9 +19,9 @@ struct Depot : DepotPool::PoolItem<&_depot_pool> {
Depot(TileIndex xy = INVALID_TILE) : xy(xy) {}
~Depot();
-};
-Depot *GetDepotByTile(TileIndex tile);
+ static Depot *GetByTile(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)
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index ed415d6c9..a2d4d5c66 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -341,7 +341,7 @@ struct DepotWindow : Window {
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);
@@ -815,7 +815,7 @@ struct DepotWindow : Window {
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,
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 1cff2d20e..33e11099c 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -300,7 +300,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex 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;
@@ -310,7 +310,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
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;
@@ -331,7 +331,7 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
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;
}
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 2f280aac2..b52a1c9a7 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1441,7 +1441,7 @@ static CommandCost RemoveTrainDepot(TileIndex tile, DoCommandFlag flags)
}
DoClearSquare(tile);
- delete GetDepotByTile(tile);
+ delete Depot::GetByTile(tile);
AddSideToSignalBuffer(tile, dir, owner);
YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir));
if (v != NULL) TryPathReserve(v, true);
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 3023cd222..4a6d22b7e 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -882,7 +882,7 @@ static CommandCost RemoveRoadDepot(TileIndex tile, DoCommandFlag flags)
if (flags & DC_EXEC) {
DoClearSquare(tile);
- delete GetDepotByTile(tile);
+ delete Depot::GetByTile(tile);
}
return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_road_depot);
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index a6bbb0572..891f3d380 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -374,7 +374,7 @@ static const Depot *FindClosestRoadDepot(const RoadVehicle *v)
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:
@@ -389,7 +389,7 @@ static const Depot *FindClosestRoadDepot(const RoadVehicle *v)
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;
}
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index e99f1c1f9..332101a54 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -100,7 +100,7 @@ static const Depot *FindClosestShipDepot(const Vehicle *v)
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
}
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 6942fb9d0..949f96625 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2231,7 +2231,7 @@ bool Train::FindClosestDepot(TileIndex *location, DestinationID *destination, bo
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;
@@ -4487,7 +4487,7 @@ static void CheckIfTrainNeedsService(Train *v)
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 &&
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 595fa702b..29bbce888 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1243,7 +1243,7 @@ void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type, TileInde
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;
}
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 44e5b710c..9e8c19f97 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -177,7 +177,7 @@ static CommandCost RemoveShipDepot(TileIndex tile, DoCommandFlag flags)
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));
diff --git a/src/yapf/yapf_road.cpp b/src/yapf/yapf_road.cpp
index c14b5b484..be962857e 100644
--- a/src/yapf/yapf_road.cpp
+++ b/src/yapf/yapf_road.cpp
@@ -403,7 +403,7 @@ public:
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;
}
};
@@ -478,7 +478,7 @@ Depot *YapfFindNearestRoadDepot(const Vehicle *v)
/* 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 */
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-02 20:16:27 +0000