summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-12-04 21:01:28 +0000
committerrubidium <rubidium@openttd.org>2009-12-04 21:01:28 +0000
commitcbc6653a470afe2da443cf58e9967b2122be1628 (patch)
treeac91b63a68e6bd9bedf43ddd2d02edd0c5f7f1d7 /src
parentfac2f8ce1ad9b527bbfdd1b80b727282a1e84e73 (diff)
downloadopenttd-cbc6653a470afe2da443cf58e9967b2122be1628.tar.xz
(svn r18405) -Fix (r18405): RVs didn't like to stop when the 'next' drive through station tile didn't have a compatible road type
Diffstat (limited to 'src')
-rw-r--r--src/roadveh_cmd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index a52d99052..243d711e4 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1470,8 +1470,8 @@ again:
if (IsDriveThroughStopTile(v->tile)) {
TileIndex next_tile = TILE_ADD(v->tile, TileOffsByDir(v->direction));
- /* Check if next inline bay is free */
- if (RoadStop::IsDriveThroughRoadStopContinuation(v->tile, next_tile)) {
+ /* Check if next inline bay is free and has compatible road. */
+ if (RoadStop::IsDriveThroughRoadStopContinuation(v->tile, next_tile) && (GetRoadTypes(next_tile) & v->compatible_roadtypes) != 0) {
v->frame++;
RoadZPosAffectSpeed(v, SetRoadVehPosition(v, x, y, false));
return true;