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

Fix deny and penalty actions not being applied to no-entry signals

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-03-12 15:06:47 +00:00
parent 16e4b84a2f
commit da88e12990
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -423,7 +423,20 @@ public:
if (has_signal_against) {
SignalType sig_type = GetSignalType(tile, TrackdirToTrack(trackdir));
if (IsPbsSignal(sig_type) && !IsNoEntrySignal(sig_type)) {
if (IsNoEntrySignal(sig_type)) {
if (ShouldCheckTraceRestrict(n, tile)) {
const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, TrackdirToTrack(trackdir));
if (prog && prog->actions_used_flags & TRPAUF_PF) {
TraceRestrictProgramResult out;
prog->Execute(Yapf().GetVehicle(), TraceRestrictProgramInput(tile, trackdir, &TraceRestrictPreviousSignalCallback, &n), out);
if (out.flags & TRPRF_DENY) {
n.m_segment->m_end_segment_reason |= ESRB_DEAD_END;
return -1;
}
cost += out.penalty;
}
}
} else if (IsPbsSignal(sig_type)) {
bool no_add_cost = false;
if (ShouldCheckTraceRestrict(n, tile)) {