diff options
author | rubidium <rubidium@openttd.org> | 2007-03-01 13:35:40 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-03-01 13:35:40 +0000 |
commit | dd403b586d779c9bf45b658323733c51508c235e (patch) | |
tree | 0880b99a709837e01bdb6038d8179f7ed60b4986 /src/depot.h | |
parent | 0945c6950b34ff0e9975b77c9aa4d6f51a5f429b (diff) | |
download | openttd-dd403b586d779c9bf45b658323733c51508c235e.tar.xz |
(svn r8954) -Codechange: remove direct map accesses from non-map-accessor headers.
Diffstat (limited to 'src/depot.h')
-rw-r--r-- | src/depot.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/depot.h b/src/depot.h index 61272670b..1a60bf940 100644 --- a/src/depot.h +++ b/src/depot.h @@ -9,6 +9,9 @@ #include "oldpool.h" #include "tile.h" #include "variables.h" +#include "road_map.h" +#include "rail_map.h" +#include "water_map.h" struct Depot { TileIndex xy; @@ -68,16 +71,16 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type) { switch (type) { case TRANSPORT_RAIL: - return IsTileType(tile, MP_RAILWAY) && (_m[tile].m5 & 0xFC) == 0xC0; + return IsTileType(tile, MP_RAILWAY) && GetRailTileType(tile) == RAIL_TILE_DEPOT; case TRANSPORT_ROAD: - return IsTileType(tile, MP_STREET) && (_m[tile].m5 & 0xF0) == 0x20; + return IsTileType(tile, MP_STREET) && GetRoadTileType(tile) == ROAD_TILE_DEPOT; case TRANSPORT_WATER: - return IsTileType(tile, MP_WATER) && (_m[tile].m5 & ~3) == 0x80; + return IsTileType(tile, MP_WATER) && GetWaterTileType(tile) == WATER_TILE_DEPOT; default: - assert(0); + NOT_REACHED(); return false; } } |