summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-02 22:56:07 +0000
committerrubidium <rubidium@openttd.org>2008-08-02 22:56:07 +0000
commita32fb70e1dc48fcd62c6c038fc9399a1e7d2256f (patch)
treef7f84f5e8536fb2891b6c74ad668434125fb85b0
parente78a235293be7938040ff33d932d44fa265ca83b (diff)
downloadopenttd-a32fb70e1dc48fcd62c6c038fc9399a1e7d2256f.tar.xz
(svn r13961) -Add [YAPP]: Handle train reversing. (michi_cc)
-rw-r--r--src/train_cmd.cpp25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 3ba1045d5..e237df907 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -63,6 +63,7 @@ static Track ChooseTrainTrack(Vehicle* v, TileIndex tile, DiagDirection enterdir
static bool TrainCheckIfLineEnds(Vehicle *v);
static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image);
static TileIndex TrainApproachingCrossingTile(const Vehicle *v);
+static void CheckNextTrainTile(Vehicle *v);
static const byte _vehicle_initial_x_fract[4] = {10, 8, 4, 8};
static const byte _vehicle_initial_y_fract[4] = { 8, 4, 8, 10};
@@ -1892,6 +1893,9 @@ static void ReverseTrainDirection(Vehicle *v)
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
}
+ /* Clear path reservation in front. */
+ FreeTrainTrackReservation(v);
+
/* Check if we were approaching a rail/road-crossing */
TileIndex crossing = TrainApproachingCrossingTile(v);
@@ -1928,6 +1932,27 @@ static void ReverseTrainDirection(Vehicle *v)
/* maybe we are approaching crossing now, after reversal */
crossing = TrainApproachingCrossingTile(v);
if (crossing != INVALID_TILE) MaybeBarCrossingWithSound(crossing);
+
+ /* If we are inside a depot after reversing, don't bother with path reserving. */
+ if (v->u.rail.track & TRACK_BIT_DEPOT) return;
+
+ /* TrainExitDir does not always produce the desired dir for depots and
+ * tunnels/bridges that is needed for UpdateSignalsOnSegment. */
+ DiagDirection dir = TrainExitDir(v->direction, v->u.rail.track);
+ if (IsRailDepotTile(v->tile) || IsTileType(v->tile, MP_TUNNELBRIDGE)) dir = INVALID_DIAGDIR;
+
+ if (UpdateSignalsOnSegment(v->tile, dir, v->owner) == SIGSEG_PBS || _settings_game.pf.reserve_paths) {
+ /* If we are currently on a tile with conventional signals, we can't treat the
+ * current tile as a safe tile or we would enter a PBS block without a reservation. */
+ bool first_tile_okay = !(IsTileType(v->tile, MP_RAILWAY) &&
+ HasSignalOnTrackdir(v->tile, GetVehicleTrackdir(v)) &&
+ !IsPbsSignal(GetSignalType(v->tile, FindFirstTrack(v->u.rail.track))));
+
+ if (TryPathReserve(v, true, first_tile_okay)) {
+ /* Do a look-ahead now in case our current tile was already a safe tile. */
+ CheckNextTrainTile(v);
+ }
+ }
}
/** Reverse train.