diff options
| author | alberth <alberth@openttd.org> | 2010-03-07 18:24:41 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-03-07 18:24:41 +0000 |
| commit | 55f8d5d80234bbeb7668c6d3263687185cd263d9 (patch) | |
| tree | 8dfcf7d8ca049547e39e95a32edd6be55fbfd834 /src/signal.cpp | |
| parent | f0de6366bac6857a85fe1677fb6703b8be187be4 (diff) | |
| download | openttd-55f8d5d80234bbeb7668c6d3263687185cd263d9.tar.xz | |
(svn r19369) -Codechange: EnsureNoTrainOnTrackBits() returns a CommandCost now.
Diffstat (limited to 'src/signal.cpp')
| -rw-r--r-- | src/signal.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/signal.cpp b/src/signal.cpp index 778e19c0e..cdcde264e 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -301,7 +301,8 @@ 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) && !EnsureNoTrainOnTrackBits(tile, tracks)) flags |= SF_TRAIN; + /* If no train detected yet, and there is not no train -> there is a train -> set the flag */ + if (!(flags & SF_TRAIN) && EnsureNoTrainOnTrackBits(tile, tracks).Failed()) 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; |