dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r9892) -Codechange: lots of ground work for allowing multiple types of "road" with multiple owners on a single tile.

Browse Source
This commit is contained in:
rubidium
2007-05-20 19:14:08 +00:00
parent 78243fbd3d
commit 51109475a2
15 changed files with 415 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/road_map.cpp
View File

@@ -14,13 +14,15 @@
#include "depot.h"
RoadBits GetAnyRoadBits(TileIndex tile)
RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt)
{
if (!HASBIT(GetRoadTypes(tile), rt)) return ROAD_NONE;
switch (GetTileType(tile)) {
case MP_STREET:
switch (GetRoadTileType(tile)) {
default:
case ROAD_TILE_NORMAL: return GetRoadBits(tile);
case ROAD_TILE_NORMAL: return GetRoadBits(tile, rt);
case ROAD_TILE_CROSSING: return GetCrossingRoadBits(tile);
case ROAD_TILE_DEPOT: return DiagDirToRoadBits(GetRoadDepotDirection(tile));
}
@@ -44,15 +46,16 @@ RoadBits GetAnyRoadBits(TileIndex tile)
}
TrackBits GetAnyRoadTrackBits(TileIndex tile)
TrackBits GetAnyRoadTrackBits(TileIndex tile, RoadType rt)
{
uint32 r;
/* Don't allow local authorities to build roads through road depots or road stops. */
if ((IsTileType(tile, MP_STREET) && IsTileDepotType(tile, TRANSPORT_ROAD)) || (IsTileType(tile, MP_STATION) && !IsDriveThroughStopTile(tile))) {
if ((IsTileType(tile, MP_STREET) && IsTileDepotType(tile, TRANSPORT_ROAD)) || (IsTileType(tile, MP_STATION) && !IsDriveThroughStopTile(tile)) || !HASBIT(GetRoadTypes(tile), rt)) {
return TRACK_BIT_NONE;
}
r = GetTileTrackStatus(tile, TRANSPORT_ROAD);
return (TrackBits)(byte)(r | (r >> 8));
}