From 595d9357c35267245d733d741a8deacce0660b59 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 20 Feb 2008 11:00:17 +0000 Subject: [PATCH] (svn r12188) -Codechange [FS#1782]: do not check twice for correct rail owner (patch by Vikthor) --- src/train_cmd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index e4f0a6bf5b..9a9f0a2f73 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3437,9 +3437,9 @@ static TileIndex TrainApproachingCrossingTile(const Vehicle *v) DiagDirection dir = TrainExitDir(v->direction, v->u.rail.track); TileIndex tile = v->tile + TileOffsByDiagDir(dir); - /* not a crossing || wrong axis || wrong railtype || wrong owner */ + /* not a crossing || wrong axis || unusable rail (wrong type or owner) */ if (!IsLevelCrossingTile(tile) || DiagDirToAxis(dir) == GetCrossingRoadAxis(tile) || - !CheckCompatibleRail(v, tile) || GetTileOwner(tile) != v->owner) { + !CheckCompatibleRail(v, tile)) { return INVALID_TILE; } @@ -3485,8 +3485,8 @@ static bool TrainCheckIfLineEnds(Vehicle *v) bits &= ~TrackCrossesTracks(FindFirstTrack(v->u.rail.track)); } - /* no suitable trackbits at all || wrong railtype || not our track */ - if (bits == TRACK_BIT_NONE || !CheckCompatibleRail(v, tile) || GetTileOwner(tile) != v->owner) { + /* no suitable trackbits at all || unusable rail (wrong type or owner) */ + if (bits == TRACK_BIT_NONE || !CheckCompatibleRail(v, tile)) { return TrainApproachingLineEnd(v, false); }