diff -r 63240e1bd6cc -r ad22eade501f src/tunnel_map.h --- a/src/tunnel_map.h Sun Dec 16 10:54:08 2007 +0000 +++ b/src/tunnel_map.h Sun Dec 16 15:38:51 2007 +0000 @@ -11,6 +11,7 @@ #include "rail.h" #include "road.h" + /** * Is this a tunnel (entrance)? * @param t the tile that might be a tunnel @@ -23,7 +24,6 @@ return !HasBit(_m[t].m5, 7); } - /** * Is this a tunnel (entrance)? * @param t the tile that might be a tunnel @@ -34,62 +34,10 @@ return IsTileType(t, MP_TUNNELBRIDGE) && IsTunnel(t); } -/** - * Gets the direction facing out of the tunnel - * @param t the tile to get the tunnel facing direction of - * @pre IsTunnelTile(t) - * @return the direction the tunnel is facing - */ -static inline DiagDirection GetTunnelDirection(TileIndex t) -{ - assert(IsTunnelTile(t)); - return (DiagDirection)GB(_m[t].m5, 0, 2); -} - -/** - * Gets the transport type of the tunnel (road or rail) - * @param t the tunnel entrance tile to get the type of - * @pre IsTunnelTile(t) - * @return the transport type in the tunnel - */ -static inline TransportType GetTunnelTransportType(TileIndex t) -{ - assert(IsTunnelTile(t)); - return (TransportType)GB(_m[t].m5, 2, 2); -} - -/** - * Is this tunnel entrance in a snowy or desert area? - * @param t the tunnel entrance tile - * @pre IsTunnelTile(t) - * @return true if and only if the tunnel entrance is in a snowy/desert area - */ -static inline bool HasTunnelSnowOrDesert(TileIndex t) -{ - assert(IsTunnelTile(t)); - return HasBit(_m[t].m4, 7); -} - -/** - * Places this tunnel entrance in a snowy or desert area, - * or takes it out of there. - * @param t the tunnel entrance tile - * @param snow_or_desert is the entrance in snow or desert (true), when - * not in snow and not in desert false - * @pre IsTunnelTile(t) - */ -static inline void SetTunnelSnowOrDesert(TileIndex t, bool snow_or_desert) -{ - assert(IsTunnelTile(t)); - SB(_m[t].m4, 7, 1, snow_or_desert); -} - - TileIndex GetOtherTunnelEnd(TileIndex); bool IsTunnelInWay(TileIndex, uint z); bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir); - /** * Makes a road tunnel entrance * @param t the entrance of the tunnel