diff options
| author | smatz <smatz@openttd.org> | 2008-02-18 16:11:31 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-02-18 16:11:31 +0000 |
| commit | 29125c0e68ffc3d4627212f33bce39ba108cd341 (patch) | |
| tree | 931c3875fce3f210d8676944d6ea635dac295fc7 /src/station_cmd.cpp | |
| parent | a0a225ab021f4cbb65679c04898d6f3eb8eb3662 (diff) | |
| download | openttd-29125c0e68ffc3d4627212f33bce39ba108cd341.tar.xz | |
(svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 8178b9e7f..e5f2e4826 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -2280,7 +2280,7 @@ static void GetTileDesc_Station(TileIndex tile, TileDesc *td) } -static uint32 GetTileTrackStatus_Station(TileIndex tile, TransportType mode, uint sub_mode) +static uint32 GetTileTrackStatus_Station(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side) { switch (mode) { case TRANSPORT_RAIL: @@ -2302,8 +2302,15 @@ static uint32 GetTileTrackStatus_Station(TileIndex tile, TransportType mode, uin break; case TRANSPORT_ROAD: - if ((GetRoadTypes(tile) & sub_mode) != 0 && IsRoadStopTile(tile)) { - return AxisToTrackBits(DiagDirToAxis(GetRoadStopDir(tile))) * 0x101; + if ((GetRoadTypes(tile) & sub_mode) != 0 && IsRoadStop(tile)) { + DiagDirection dir = GetRoadStopDir(tile); + Axis axis = DiagDirToAxis(dir); + + if (side != INVALID_DIAGDIR) { + if (axis != DiagDirToAxis(side) || (IsStandardRoadStopTile(tile) && dir != side)) return 0; + } + + return AxisToTrackBits(axis) * 0x101; } break; |