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

Tracerestrict: Add flag for whether reserve through is always set

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-11 16:40:32 +01:00
parent 5a02a13885
commit 02dabad81e
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pbs.cpp
View File

@@ -1262,6 +1262,7 @@ bool IsSafeWaitingPosition(const Train *v, TileIndex tile, Trackdir trackdir, bo
if (IsRestrictedSignal(ft.m_new_tile)) { if (IsRestrictedSignal(ft.m_new_tile)) {
const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(ft.m_new_tile, TrackdirToTrack(td)); const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(ft.m_new_tile, TrackdirToTrack(td));
if (prog && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH) { if (prog && prog->actions_used_flags & TRPAUF_RESERVE_THROUGH) {
if (prog->actions_used_flags & TRPAUF_RESERVE_THROUGH_ALWAYS) return false;
TraceRestrictProgramResult out; TraceRestrictProgramResult out;
prog->Execute(v, TraceRestrictProgramInput(ft.m_new_tile, td, &VehiclePosTraceRestrictPreviousSignalCallback, nullptr), out); prog->Execute(v, TraceRestrictProgramInput(ft.m_new_tile, td, &VehiclePosTraceRestrictPreviousSignalCallback, nullptr), out);
if (out.flags & TRPRF_RESERVE_THROUGH) { if (out.flags & TRPRF_RESERVE_THROUGH) {

5
src/tracerestrict.cpp
View File

@@ -931,6 +931,11 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
case TRIT_RESERVE_THROUGH: case TRIT_RESERVE_THROUGH:
actions_used_flags |= TRPAUF_RESERVE_THROUGH; actions_used_flags |= TRPAUF_RESERVE_THROUGH;
if (GetTraceRestrictValue(item)) {
actions_used_flags &= ~TRPAUF_RESERVE_THROUGH_ALWAYS;
} else if (condstack.empty()) {
actions_used_flags |= TRPAUF_RESERVE_THROUGH_ALWAYS;
}
break; break;
case TRIT_LONG_RESERVE: case TRIT_LONG_RESERVE:

1
src/tracerestrict.h
View File

@@ -422,6 +422,7 @@ enum TraceRestrictProgramActionsUsedFlags {
TRPAUF_SLOT_ACQUIRE_ON_RES = 1 << 14, ///< Slot acquire (on reserve) action is present TRPAUF_SLOT_ACQUIRE_ON_RES = 1 << 14, ///< Slot acquire (on reserve) action is present
TRPAUF_SPEED_ADAPTATION = 1 << 15, ///< Speed adaptation control TRPAUF_SPEED_ADAPTATION = 1 << 15, ///< Speed adaptation control
TRPAUF_PBS_RES_END_SIMULATE = 1 << 16, ///< PBS reservations ending at this signal slot changes must be fully simulated in dry run mode TRPAUF_PBS_RES_END_SIMULATE = 1 << 16, ///< PBS reservations ending at this signal slot changes must be fully simulated in dry run mode
TRPAUF_RESERVE_THROUGH_ALWAYS = 1 << 17, ///< Reserve through action is unconditionally set
}; };
DECLARE_ENUM_AS_BIT_SET(TraceRestrictProgramActionsUsedFlags) DECLARE_ENUM_AS_BIT_SET(TraceRestrictProgramActionsUsedFlags)