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

Tracerestrict: Handle slot acquire on tunnel/bridge entrance reserve

Browse Source 
When using realistic braking
Using the same context as PBS end acquire/release
This commit is contained in:
Jonathan G Rennison
2024-01-20 22:20:51 +00:00
parent 9e8a43144a
commit 7d1e350b94
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pbs.cpp
View File

@@ -1531,6 +1531,21 @@ bool IsSafeWaitingPosition(const Train *v, TileIndex tile, Trackdir trackdir, bo
return false;
}
void PBSWaitingPositionRestrictedSignalState::TraceRestrictExecuteResEndSlotIntl(const Train *v)
{
TraceRestrictProgramActionsUsedFlags actions_used_flags = TRPAUF_PBS_RES_END_SLOT;
const bool tb_entrance_slots = _settings_game.vehicle.train_braking_model == TBM_REALISTIC && IsTunnelBridgeSignalSimulationEntranceTile(this->tile);
if (tb_entrance_slots) actions_used_flags |= TRPAUF_SLOT_ACQUIRE;
if (prog->actions_used_flags & actions_used_flags) {
TraceRestrictProgramResult out;
TraceRestrictProgramInput input(this->tile, this->trackdir, &VehiclePosTraceRestrictPreviousSignalCallback, nullptr);
input.permitted_slot_operations = TRPISP_PBS_RES_END_ACQUIRE | TRPISP_PBS_RES_END_RELEASE;
if (tb_entrance_slots) input.permitted_slot_operations = TRPISP_ACQUIRE;
prog->Execute(v, input, out);
}
}
bool IsWaitingPositionFreeTraceRestrictExecute(const TraceRestrictProgram *prog, const Train *v, TileIndex tile, Trackdir trackdir)
{
if (prog != nullptr && prog->actions_used_flags & TRPAUF_PBS_RES_END_WAIT) {