cpp/openttd-patchpack/source Changeset - r14217:40beee5d2e82

Changeset - r14217:40beee5d2e82

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

michi_cc - 14 years ago 2010-01-11 00:02:14
michi_cc@openttd.org

(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.

1 file changed with 0 insertions and 14 deletions:

src/train_cmd.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -2851,20 +2851,6 @@ bool TryPathReserve(Train *v, bool mark_ @@
+		}
+	}
 	/* 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.

0 comments (0 inline, 0 general)