diff options
| author | rubidium <rubidium@openttd.org> | 2007-05-24 22:41:50 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-05-24 22:41:50 +0000 |
| commit | 440d723d842db2f246428de2e404091e074ed254 (patch) | |
| tree | 4ec491716328387ce65a5c1f45b836b6f5f57ce2 /src/road_cmd.cpp | |
| parent | b82676be2a39adeb883f9dd5c67125eec12f2753 (diff) | |
| download | openttd-440d723d842db2f246428de2e404091e074ed254.tar.xz | |
(svn r9914) -Codechange: prepare GTTS and the pathfinders to handle multiple road types on a single tile.
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 7b412e92f..7fb49646e 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1111,9 +1111,8 @@ static const byte _road_trackbits[16] = { 0x0, 0x0, 0x0, 0x10, 0x0, 0x2, 0x8, 0x1A, 0x0, 0x4, 0x1, 0x15, 0x20, 0x26, 0x29, 0x3F, }; -static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode) +static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode, uint sub_mode) { - RoadType rt = ROADTYPE_ROAD; switch (mode) { case TRANSPORT_RAIL: @@ -1121,10 +1120,12 @@ static uint32 GetTileTrackStatus_Road(TileIndex tile, TransportType mode) return GetCrossingRailBits(tile) * 0x101; case TRANSPORT_ROAD: - if (!HASBIT(GetRoadTypes(tile), rt)) return 0; + if ((GetRoadTypes(tile) & sub_mode) == 0) return 0; switch (GetRoadTileType(tile)) { - case ROAD_TILE_NORMAL: + case ROAD_TILE_NORMAL: { + RoadType rt = (RoadType)FindFirstBit(sub_mode); return HasRoadWorks(tile) ? 0 : _road_trackbits[GetRoadBits(tile, rt)] * 0x101; + } case ROAD_TILE_CROSSING: { uint32 r = AxisToTrackBits(GetCrossingRoadAxis(tile)) * 0x101; |