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

Change: Update signals for extended rail depots.

pull/8480/head
J0anJosep 2020-12-31 12:11:14 +01:00
parent fc5445d208
commit 12862b5df8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/signal.cpp
View File

@ -278,6 +278,13 @@ static SigFlags ExploreSegment(Owner owner)
if (GetTileOwner(tile) != owner) continue; // do not propagate signals on others' tiles (remove for tracksharing) if (GetTileOwner(tile) != owner) continue; // do not propagate signals on others' tiles (remove for tracksharing)
if (IsRailDepot(tile)) { if (IsRailDepot(tile)) {
if (IsExtendedRailDepot(tile)) {
assert(enterdir != INVALID_DIAGDIR);
if (DiagDirToDiagTrack(enterdir) != GetRailDepotTrack(tile)) continue; // different axis
if (!(flags & SF_TRAIN) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags |= SF_TRAIN;
tile += TileOffsByDiagDir(exitdir);
break;
}
if (enterdir == INVALID_DIAGDIR) { // from 'inside' - train just entered or left the depot if (enterdir == INVALID_DIAGDIR) { // from 'inside' - train just entered or left the depot
if (!(flags & SF_TRAIN) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags |= SF_TRAIN; if (!(flags & SF_TRAIN) && HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum)) flags |= SF_TRAIN;
exitdir = GetRailDepotDirection(tile); exitdir = GetRailDepotDirection(tile);
@ -496,8 +503,14 @@ static SigSegState UpdateSignalsInBuffer(Owner owner)
case MP_RAILWAY: case MP_RAILWAY:
if (IsRailDepot(tile)) { if (IsRailDepot(tile)) {
/* 'optimization assert' do not try to update signals in other cases */ /* 'optimization assert' do not try to update signals in other cases */
assert(dir == INVALID_DIAGDIR || dir == GetRailDepotDirection(tile)); if (IsExtendedRailDepot(tile)) {
_tbdset.Add(tile, INVALID_DIAGDIR); // start from depot inside dir = GetRailDepotDirection(tile);
_tbdset.Add(tile, dir);
_tbdset.Add(tile + TileOffsByDiagDir(dir), ReverseDiagDir(dir));
} else {
assert(dir == INVALID_DIAGDIR || dir == GetRailDepotDirection(tile));
_tbdset.Add(tile, INVALID_DIAGDIR); // start from depot inside
}
break; break;
} }
[[fallthrough]]; [[fallthrough]];