summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2015-01-02 12:11:20 +0000
committerrubidium <rubidium@openttd.org>2015-01-02 12:11:20 +0000
commit193f653c567ec65efe00e91e88c9ff3d63bf4a2f (patch)
tree2c248ad4fb6653bd85feee43b11389d776d29b69
parent8621ca411578f0c0a98fc17e6dc28f9d52f3f791 (diff)
downloadopenttd-193f653c567ec65efe00e91e88c9ff3d63bf4a2f.tar.xz
(svn r27107) -Fix [FS#6183]: road vehicles could not reverse to be sent to depots when the following tile has the right type to run on, but could not be entered; e.g. facing toward a depot with the entry facing the wrong way failed to reverse whereas facing towards an empty tile allowed the vehicle to reverse (estys)
-rw-r--r--src/pathfinder/follow_track.hpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pathfinder/follow_track.hpp b/src/pathfinder/follow_track.hpp
index 7cc7c7248..a16512bc0 100644
--- a/src/pathfinder/follow_track.hpp
+++ b/src/pathfinder/follow_track.hpp
@@ -130,9 +130,8 @@ struct CFollowTrackT
if (!CanExitOldTile()) return false;
FollowTileExit();
if (!QueryNewTileTrackStatus()) return TryReverse();
- if (!CanEnterNewTile()) return false;
m_new_td_bits &= DiagdirReachesTrackdirs(m_exitdir);
- if (m_new_td_bits == TRACKDIR_BIT_NONE) {
+ if (m_new_td_bits == TRACKDIR_BIT_NONE || !CanEnterNewTile()) {
/* In case we can't enter the next tile, but are
* a normal road vehicle, then we can actually
* try to reverse as this is the end of the road.