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

(svn r4275) -Codechange: Use of map accessor functions inside station_map.h when possible

Browse Source
This commit is contained in:
celestar
2006-04-04 11:51:16 +00:00
parent 936be2391c
commit 0087f9dc74
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
station_map.h
View File

@@ -76,15 +76,6 @@ static inline bool IsRailwayStationTile(TileIndex t)
return IsTileType(t, MP_STATION) && IsRailwayStation(t); return IsTileType(t, MP_STATION) && IsRailwayStation(t);
} }
static inline bool IsCompatibleTrainStationTile(TileIndex t1, TileIndex t2)
{
assert(IsRailwayStationTile(t2));
return
IsRailwayStationTile(t1) &&
IsCompatibleRail(GetRailType(t1), GetRailType(t2)) &&
GB(_m[t1].m5, 0, 1) == GB(_m[t2].m5, 0, 1); // same direction?
}
static inline bool IsHangar(TileIndex t) static inline bool IsHangar(TileIndex t)
{ {
assert(IsTileType(t, MP_STATION)); assert(IsTileType(t, MP_STATION));
@@ -175,6 +166,15 @@ static inline Track GetRailStationTrack(TileIndex t)
return GetRailStationAxis(t) == AXIS_X ? TRACK_X : TRACK_Y; return GetRailStationAxis(t) == AXIS_X ? TRACK_X : TRACK_Y;
} }
static inline bool IsCompatibleTrainStationTile(TileIndex t1, TileIndex t2)
{
assert(IsRailwayStationTile(t2));
return
IsRailwayStationTile(t1) &&
IsCompatibleRail(GetRailType(t1), GetRailType(t2)) &&
GetRailStationAxis(t1) == GetRailStationAxis(t2);
}
static inline DiagDirection GetDockDirection(TileIndex t) static inline DiagDirection GetDockDirection(TileIndex t)
{ {