Mercurial > hg > openttd
changeset 8606:86c438420c53 draft
(svn r12188) -Codechange [FS#1782]: do not check twice for correct rail owner (patch by Vikthor)
author | smatz <smatz@openttd.org> |
---|---|
date | Wed, 20 Feb 2008 11:00:17 +0000 |
parents | effdced88525 |
children | 3f393a55911b |
files | src/train_cmd.cpp |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3437,9 +3437,9 @@ 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 @@ 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); }