mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Merge 3b540a01d9 into d6aa09f96a

pull/9958/merge
nchappe 2024-10-24 13:45:14 -04:00 committed by GitHub
parent d6aa09f96a 3b540a01d9
commit 8d43fa5635
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pathfinder/yapf/yapf_costrail.hpp
View File

@ -12,6 +12,7 @@
#include "../../pbs.h" #include "../../pbs.h"
#include "../../vehiclelist.h"
template <class Types> template <class Types>
class CYapfCostRailT : public CYapfCostBase { class CYapfCostRailT : public CYapfCostBase {
@ -395,6 +396,18 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th
} else if (IsRailDepotTile(cur.tile)) { } else if (IsRailDepotTile(cur.tile)) {
/* We will end in this pass (depot is possible target) */ /* We will end in this pass (depot is possible target) */
end_segment_reason |= ESRB_DEPOT; end_segment_reason |= ESRB_DEPOT;
/* Add a penalty for each non-stopped train in the depot.
* The penalty is capped at 8 trains. */
VehicleList vl;
BuildDepotVehicleList(VEH_TRAIN, cur.tile, &vl, nullptr, false);
int count = 0;
for (auto v : vl) {
if (!(v->vehstatus & VS_STOPPED)) {
count++;
if (count == 8) break;
}
}
segment_cost += Yapf().PfGetSettings().rail_pbs_cross_penalty * count;
} else if (cur.tile_type == MP_STATION && IsRailWaypoint(cur.tile)) { } else if (cur.tile_type == MP_STATION && IsRailWaypoint(cur.tile)) {
if (v->current_order.IsType(OT_GOTO_WAYPOINT) && if (v->current_order.IsType(OT_GOTO_WAYPOINT) &&