mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27418) -Fix [FS#6329] [FS#6379]: Desync due to incorrect storage of segments with different railtype in the YAPF cache. (JGR)

release/1.6
frosch 2015-10-30 16:18:03 +00:00
parent c1c49a0e52
commit 22e6a2590d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pathfinder/follow_track.hpp
View File

@ -144,7 +144,12 @@ struct CFollowTrackT
* missing road bit, or inability to connect the * missing road bit, or inability to connect the
* different bits due to slopes. */ * different bits due to slopes. */
if (IsRoadTT() && !IsTram() && TryReverse()) return true; if (IsRoadTT() && !IsTram() && TryReverse()) return true;
m_err = EC_NO_WAY;
/* CanEnterNewTile already set a reason.
* Do NOT overwrite it (important for example for EC_RAIL_TYPE).
* Only set a reason if CanEnterNewTile was not called */
if (m_new_td_bits == TRACKDIR_BIT_NONE) m_err = EC_NO_WAY;
return false; return false;
} }
if (!Allow90degTurns()) { if (!Allow90degTurns()) {