diff options
| author | michi_cc <michi_cc@openttd.org> | 2010-01-11 00:02:14 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2010-01-11 00:02:14 +0000 |
| commit | de878fad312a87837ee12af4c491d45940076ec8 (patch) | |
| tree | be06719fa78e0f495d7eab9b3fd019e6ac8b18fb | |
| parent | f51aac3523b60e2d89cd906d71cf86828ed95a00 (diff) | |
| download | openttd-de878fad312a87837ee12af4c491d45940076ec8.tar.xz | |
(svn r18778) -Fix [FS#3483]: [YAPP] Remove a special check for two-sided signals when reserving a path as this causes trains to get stuck in front of them.
| -rw-r--r-- | src/train_cmd.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 17dad7aea..17a066423 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2851,20 +2851,6 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay) } } - /* Special check if we are in front of a two-sided conventional signal. */ - DiagDirection dir = TrainExitDir(v->direction, v->track); - TileIndex next_tile = TileAddByDiagDir(v->tile, dir); - if (IsTileType(next_tile, MP_RAILWAY) && HasReservedTracks(next_tile, DiagdirReachesTracks(dir))) { - /* Can have only one reserved trackdir. */ - Trackdir td = FindFirstTrackdir(TrackBitsToTrackdirBits(GetReservedTrackbits(next_tile)) & DiagdirReachesTrackdirs(dir)); - if (HasSignalOnTrackdir(next_tile, td) && HasSignalOnTrackdir(next_tile, ReverseTrackdir(td)) && - !IsPbsSignal(GetSignalType(next_tile, TrackdirToTrack(td)))) { - /* Signal already reserved, is not ours. */ - if (mark_as_stuck) MarkTrainAsStuck(v); - return false; - } - } - Vehicle *other_train = NULL; PBSTileInfo origin = FollowTrainReservation(v, &other_train); /* The path we are driving on is alread blocked by some other train. |