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

Fix 7bdfb38: Drive-thru road stations can be connected at either end (#8528)

pull/8529/head
Tyler Trahan 2021-01-08 12:56:39 -05:00 committed by GitHub
parent 9c0da686da
commit b08c66a796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/town_cmd.cpp
View File

@ -1112,6 +1112,7 @@ static bool GrowTownWithRoad(const Town *t, TileIndex tile, RoadBits rcmd)
* Checks if a town road can be continued into the next tile. * Checks if a town road can be continued into the next tile.
* Road vehicle stations, bridges, and tunnels are fine, as long as they are facing the right direction. * Road vehicle stations, bridges, and tunnels are fine, as long as they are facing the right direction.
* *
* @param t The current town
* @param tile The tile where the road would be built * @param tile The tile where the road would be built
* @param road_dir The direction of the road * @param road_dir The direction of the road
* @return true if the road can be continued, else false * @return true if the road can be continued, else false
@ -1133,8 +1134,8 @@ static bool CanRoadContinueIntoNextTile(const Town* t, const TileIndex tile, con
/* If the next tile is a station, allow if it's a road station facing the proper direction. Otherwise return false. */ /* If the next tile is a station, allow if it's a road station facing the proper direction. Otherwise return false. */
if (IsTileType(next_tile, MP_STATION)) { if (IsTileType(next_tile, MP_STATION)) {
/* If the next tile is a road station, allow if it's facing the same direction, otherwise disallow. */ /* If the next tile is a road station, allow if it can be entered by the new tunnel/bridge, otherwise disallow. */
return IsRoadStop(next_tile) && GetRoadStopDir(next_tile) == ReverseDiagDir(road_dir); return IsRoadStop(next_tile) && (GetRoadStopDir(next_tile) == ReverseDiagDir(road_dir) || (IsDriveThroughStopTile(next_tile) && GetRoadStopDir(next_tile) == road_dir));
} }
/* If the next tile is a road depot, allow if it's facing the right way. */ /* If the next tile is a road depot, allow if it's facing the right way. */