dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up PR #138

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-07-11 22:02:32 +01:00
parent 04b8e2f8a9
commit c93cffed64
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/pathfinder/yapf/yapf_road.cpp
View File

@@ -24,7 +24,7 @@
*/ */
const uint MAX_RV_PF_TILES = 1 << 11; const uint MAX_RV_PF_TILES = 1 << 11;
const int MAX_TARGETS = 4; const int MAX_RV_LEADER_TARGETS = 4;
template <class Types> template <class Types>
class CYapfCostRoadT class CYapfCostRoadT
@@ -72,11 +72,11 @@ protected:
{ {
int cost = 0; int cost = 0;
bool predictedOccupied = false; bool predicted_occupied = false;
for (int i = 0; i < MAX_TARGETS && Yapf().leaderTargets[i] != INVALID_TILE; ++i) { for (int i = 0; i < MAX_RV_LEADER_TARGETS && Yapf().leader_targets[i] != INVALID_TILE; ++i) {
if (Yapf().leaderTargets[i] != tile) continue; if (Yapf().leader_targets[i] != tile) continue;
cost += Yapf().PfGetSettings().road_curve_penalty; cost += Yapf().PfGetSettings().road_curve_penalty;
predictedOccupied = true; predicted_occupied = true;
break; break;
} }
@@ -104,13 +104,13 @@ protected:
cost += entry->GetOccupied() * Yapf().PfGetSettings().road_stop_occupied_penalty / entry->GetLength(); cost += entry->GetOccupied() * Yapf().PfGetSettings().road_stop_occupied_penalty / entry->GetLength();
} }
if (predictedOccupied) { if (predicted_occupied) {
cost += Yapf().PfGetSettings().road_stop_occupied_penalty; cost += Yapf().PfGetSettings().road_stop_occupied_penalty;
} }
} else { } else {
/* Increase cost for filled road stops */ /* Increase cost for filled road stops */
cost += Yapf().PfGetSettings().road_stop_bay_occupied_penalty * (!rs->IsFreeBay(0) + !rs->IsFreeBay(1)) / 2; cost += Yapf().PfGetSettings().road_stop_bay_occupied_penalty * (!rs->IsFreeBay(0) + !rs->IsFreeBay(1)) / 2;
if (predictedOccupied) { if (predicted_occupied) {
cost += Yapf().PfGetSettings().road_stop_bay_occupied_penalty; cost += Yapf().PfGetSettings().road_stop_bay_occupied_penalty;
} }
} }
@@ -347,30 +347,33 @@ public:
}; };
struct FindVehiclesOnTileProcData { struct FindVehiclesOnTileProcData {
const Vehicle *originVehicle; const Vehicle *origin_vehicle;
TileIndex (*targets)[MAX_TARGETS]; TileIndex (*targets)[MAX_RV_LEADER_TARGETS];
}; };
static Vehicle * FindVehiclesOnTileProc(Vehicle *v, void *_data) static Vehicle * FindVehiclesOnTileProc(Vehicle *v, void *_data)
{ {
FindVehiclesOnTileProcData *data = (FindVehiclesOnTileProcData*)(_data); FindVehiclesOnTileProcData *data = (FindVehiclesOnTileProcData*)(_data);
if (data->originVehicle == v) if (data->origin_vehicle == v) {
return nullptr; return nullptr;
}
/* only consider vehicles going to the same station as us */ /* only consider vehicles going to the same station as us */
if(data->originVehicle->current_order.GetDestination() != v->current_order.GetDestination()) if (!v->current_order.IsType(OT_GOTO_STATION) || data->origin_vehicle->current_order.GetDestination() != v->current_order.GetDestination()) {
return nullptr; return nullptr;
}
TileIndex ti = v->tile + TileOffsByDir(v->direction); TileIndex ti = v->tile + TileOffsByDir(v->direction);
for (int i = 0; i < MAX_TARGETS; i++) { for (int i = 0; i < MAX_RV_LEADER_TARGETS; i++) {
if ((*data->targets)[i] == INVALID_TILE) { if ((*data->targets)[i] == INVALID_TILE) {
(*data->targets)[i] = ti; (*data->targets)[i] = ti;
break; break;
} }
if ((*data->targets)[i] == ti) if ((*data->targets)[i] == ti) {
return nullptr; break;
}
} }
return nullptr; return nullptr;
@@ -440,13 +443,15 @@ public:
Yapf().SetOrigin(src_tile, src_trackdirs); Yapf().SetOrigin(src_tile, src_trackdirs);
Yapf().SetDestination(v); Yapf().SetDestination(v);
for (int i = 0; i < MAX_TARGETS; ++i) { for (int i = 0; i < MAX_RV_LEADER_TARGETS; ++i) {
Yapf().leaderTargets[i] = INVALID_TILE; Yapf().leader_targets[i] = INVALID_TILE;
} }
if (v->current_order.IsType(OT_GOTO_STATION)) {
FindVehiclesOnTileProcData data; FindVehiclesOnTileProcData data;
data.originVehicle = v; data.origin_vehicle = v;
data.targets = &Yapf().leaderTargets; data.targets = &Yapf().leader_targets;
FindVehicleOnPos(tile, VEH_ROAD, &data, &FindVehiclesOnTileProc); FindVehicleOnPos(tile, VEH_ROAD, &data, &FindVehiclesOnTileProc);
}
/* find the best path */ /* find the best path */
path_found = Yapf().FindPath(v); path_found = Yapf().FindPath(v);
@@ -595,7 +600,7 @@ struct CYapfRoad_TypesT
template <class Types> template <class Types>
struct CYapfRoadCommon : CYapfT<Types> { struct CYapfRoadCommon : CYapfT<Types> {
TileIndex leaderTargets[MAX_TARGETS]; ///< the tiles targeted by vehicles in front of the current vehicle TileIndex leader_targets[MAX_RV_LEADER_TARGETS]; ///< the tiles targeted by vehicles in front of the current vehicle
}; };
struct CYapfRoad1 : CYapfRoadCommon<CYapfRoad_TypesT<CYapfRoad1 , CRoadNodeListTrackDir, CYapfDestinationTileRoadT > > {}; struct CYapfRoad1 : CYapfRoadCommon<CYapfRoad_TypesT<CYapfRoad1 , CRoadNodeListTrackDir, CYapfDestinationTileRoadT > > {};