(svn r27259) -Fix (r27244): Incorrect merge. (_dp_)

This commit is contained in:
frosch 2015-04-27 21:40:46 +00:00
parent 108aa4e7af
commit 071b574e2c

View File

@ -1331,7 +1331,7 @@ static bool CanFollowRoad(TileIndex tile, DiagDirection dir)
/* Check whether a road connection already exists, /* Check whether a road connection already exists,
* and it leads somewhere else. */ * and it leads somewhere else. */
RoadBits back_rb = DiagDirToRoadBits(ReverseDiagDir(dir)); RoadBits back_rb = DiagDirToRoadBits(ReverseDiagDir(dir));
return (target_rb & back_rb) != 0 && (target_rb & back_rb) != back_rb; return (target_rb & back_rb) != 0 && (target_rb & ~back_rb) != 0;
} }
} }