petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}()

Browse Source
This commit is contained in:
tron
2006-03-17 10:10:31 +00:00
parent d8677f1afa
commit 89090790c2
9 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rail.c
View File

@@ -108,43 +108,39 @@ const Trackdir _reverse_trackdir[] = {
RailType GetTileRailType(TileIndex tile, Trackdir trackdir)
{
RailType type = INVALID_RAILTYPE;
DiagDirection exitdir = TrackdirToExitdir(trackdir);
switch (GetTileType(tile)) {
case MP_RAILWAY:
/* railway track */
type = _m[tile].m3 & RAILTYPE_MASK;
break;
return GetRailType(tile);
case MP_STREET:
/* rail/road crossing */
if (IsLevelCrossing(tile))
type = _m[tile].m4 & RAILTYPE_MASK;
if (IsLevelCrossing(tile)) return GetRailTypeCrossing(tile);
break;
case MP_STATION:
if (IsTrainStationTile(tile))
type = _m[tile].m3 & RAILTYPE_MASK;
if (IsTrainStationTile(tile)) return GetRailType(tile);
break;
case MP_TUNNELBRIDGE:
if (IsTunnel(tile)) {
if (GetTunnelTransportType(tile) == TRANSPORT_RAIL) {
return _m[tile].m3 & RAILTYPE_MASK;
return GetRailType(tile);
}
} else {
if (IsBridgeRamp(tile)) {
if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) {
return _m[tile].m3 & RAILTYPE_MASK;
return GetRailType(tile);
}
} else {
if (GetBridgeAxis(tile) == DiagDirToAxis(exitdir)) {
if (GetBridgeTransportType(tile) == TRANSPORT_RAIL) {
/* on the bridge */
return (_m[tile].m3 >> 4) & RAILTYPE_MASK;
return GetRailTypeOnBridge(tile);
}
} else {
if (IsTransportUnderBridge(tile) &&
GetTransportTypeUnderBridge(tile) == TRANSPORT_RAIL) {
/* under the bridge */
return _m[tile].m3 & RAILTYPE_MASK;
return GetRailType(tile);
}
}
}
@@ -154,5 +150,5 @@ RailType GetTileRailType(TileIndex tile, Trackdir trackdir)
default:
break;
}
return type;
return INVALID_RAILTYPE;
}