From f3df0aa6e85b854c084268042bbb021f55a47b77 Mon Sep 17 00:00:00 2001 From: KUDr Date: Tue, 29 Aug 2006 19:46:31 +0000 Subject: [PATCH] (svn r6223) -Fix: RVs with empty order list were able to enter the depot or road stop from the back. I introduced this bug when I "improved" GetTileTrackStatus(). (thanks glx for the report and fix). --- roadveh_cmd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 93e3ff0d3a..00843d65a1 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -1035,13 +1035,13 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir } if (IsTileType(tile, MP_STREET)) { - if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && !IsTileOwner(tile, v->owner)) { - /* Road depot owned by another player */ + if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && (!IsTileOwner(tile, v->owner) || GetRoadDepotDirection(tile) == enterdir)) { + /* Road depot owned by another player or with the wrong orientation */ bitmask = 0; } } else if (IsTileType(tile, MP_STATION) && IsRoadStopTile(tile)) { - if (!IsTileOwner(tile, v->owner)) { - // different station owner + if (!IsTileOwner(tile, v->owner) || GetRoadStopDir(tile) == enterdir) { + /* different station owner or wrong orientation */ bitmask = 0; } else { /* Our station */