From 5d939d9c107e007841450ea6ecbc2d963e9e8662 Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 13 Mar 2006 20:12:35 +0000 Subject: [PATCH] (svn r3851) Rail depots only have an entrance at one side, therefore use UpdateSignalsOnSegment() instead of SetSignalsOnBothDir() --- rail_cmd.c | 6 +++--- train_cmd.c | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rail_cmd.c b/rail_cmd.c index 73c6870413..1456e85a0d 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -665,7 +665,7 @@ int32 CmdBuildTrainDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) d->xy = tile; d->town_index = ClosestTownFromTile(tile, (uint)-1)->index; - SetSignalsOnBothDir(tile, (p2 & 1) ? 2 : 1); + UpdateSignalsOnSegment(tile, p2); } return cost + _price.build_train_depot; @@ -1023,10 +1023,10 @@ static int32 RemoveTrainDepot(TileIndex tile, uint32 flags) return CMD_ERROR; if (flags & DC_EXEC) { - Track track = TrackdirToTrack(DiagdirToDiagTrackdir(GetRailDepotDirection(tile))); + DiagDirection dir = GetRailDepotDirection(tile); DoDeleteDepot(tile); - SetSignalsOnBothDir(tile, track); + UpdateSignalsOnSegment(tile, dir); } return _price.remove_train_depot; diff --git a/train_cmd.c b/train_cmd.c index b14a9e0ff8..8b0176a0b5 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -3282,12 +3282,9 @@ void Train_Tick(Vehicle *v) } -static const byte _depot_track_ind[4] = {0,1,0,1}; - - void TrainEnterDepot(Vehicle *v, TileIndex tile) { - SetSignalsOnBothDir(tile, _depot_track_ind[GetRailDepotDirection(tile)]); + UpdateSignalsOnSegment(tile, GetRailDepotDirection(tile)); if (!IsFrontEngine(v)) v = GetFirstVehicleInChain(v);