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

(svn r19365) -Codechange: Move EnsureNoTrainOnTrackProc() to src/vehicle.cpp.

Browse Source
This commit is contained in:
alberth
2010-03-07 15:54:58 +00:00
parent cca91d7e75
commit 014f651e65
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/signal.cpp
View File

@@ -301,7 +301,7 @@ static SigFlags ExploreSegment(Owner owner)
if (tracks == TRACK_BIT_HORZ || tracks == TRACK_BIT_VERT) { // there is exactly one incidating track, no need to check
tracks = tracks_masked;
if (!(flags & SF_TRAIN) && HasVehicleOnPos(tile, &tracks, &EnsureNoTrainOnTrackProc)) flags |= SF_TRAIN;
if (!(flags & SF_TRAIN) && !EnsureNoTrainOnTrackBits(tile, tracks)) flags |= SF_TRAIN;
} else {
if (tracks_masked == TRACK_BIT_NONE) continue; // no incidating track
if (!(flags & SF_TRAIN) && HasVehicleOnPos(tile, NULL, &TrainOnTileEnum)) flags |= SF_TRAIN;