Mercurial > hg > openttd
changeset 9500:748667b9af3d draft
(svn r13480) -Fix [FS#2050]: RVs stoppping at drive through stations of other companies.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 11 Jun 2008 19:57:45 +0000 |
| parents | 408ed1c1d62b |
| children | 49baa15b00b5 |
| files | src/roadveh_cmd.cpp |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -1714,6 +1714,7 @@ _road_veh_data_1[v->u.road.state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)] == v->u.road.frame) || (IsInsideMM(v->u.road.state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) && v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile)) && + v->owner == GetRoadOwner(v->tile, v->u.road.roadtype) && GetRoadStopType(v->tile) == (IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? ROADSTOP_BUS : ROADSTOP_TRUCK) && v->u.road.frame == RVC_DRIVE_THROUGH_STOP_FRAME))) {