summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-06-11 19:57:45 +0000
committerrubidium <rubidium@openttd.org>2008-06-11 19:57:45 +0000
commit8e7f5072ce26fd4ff0156390ef45d25add2c393e (patch)
treeff19c947fb714c6518fe4c1a0cbac353babb7f4e
parent52e1ca3ba38f52e5ff1f32ac195a66055449c85c (diff)
downloadopenttd-8e7f5072ce26fd4ff0156390ef45d25add2c393e.tar.xz
(svn r13480) -Fix [FS#2050]: RVs stoppping at drive through stations of other companies.
-rw-r--r--src/roadveh_cmd.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 7ecd0779b..e7e17b2e7 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1714,6 +1714,7 @@ again:
_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))) {