diff options
author | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
commit | 66bbf336c6af7353ef0aeed58002c46543b30635 (patch) | |
tree | ad4a63860df2626b22f77e7dac712e958bea54cb /tunnel_map.h | |
parent | ccc0a3f4dbf58c005b22341ac8874252924690cd (diff) | |
download | openttd-66bbf336c6af7353ef0aeed58002c46543b30635.tar.xz |
(svn r7759) -Merge: makefile rewrite. This merge features:
- A proper ./configure, so everything needs to be configured only once, not for every make.
- Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
- A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
- Proper support for OSX universal binaries.
- Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
- Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.
Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.
Diffstat (limited to 'tunnel_map.h')
-rw-r--r-- | tunnel_map.h | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/tunnel_map.h b/tunnel_map.h deleted file mode 100644 index c9a3a36a3..000000000 --- a/tunnel_map.h +++ /dev/null @@ -1,75 +0,0 @@ -/* $Id$ */ - -#ifndef TUNNEL_MAP_H -#define TUNNEL_MAP_H - -#include "direction.h" -#include "macros.h" -#include "map.h" -#include "rail.h" - - -static inline bool IsTunnel(TileIndex t) -{ - assert(IsTileType(t, MP_TUNNELBRIDGE)); - return !HASBIT(_m[t].m5, 7); -} - - -static inline bool IsTunnelTile(TileIndex t) -{ - return IsTileType(t, MP_TUNNELBRIDGE) && IsTunnel(t); -} - - -static inline DiagDirection GetTunnelDirection(TileIndex t) -{ - assert(IsTunnelTile(t)); - return (DiagDirection)GB(_m[t].m5, 0, 2); -} - - -static inline TransportType GetTunnelTransportType(TileIndex t) -{ - assert(IsTunnelTile(t)); - return (TransportType)GB(_m[t].m5, 2, 2); -} - -static inline bool HasTunnelSnowOrDesert(TileIndex t) -{ - assert(IsTunnelTile(t)); - return HASBIT(_m[t].m4, 7); -} - -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); - - -static inline void MakeRoadTunnel(TileIndex t, Owner o, DiagDirection d) -{ - SetTileType(t, MP_TUNNELBRIDGE); - SetTileOwner(t, o); - _m[t].m2 = 0; - _m[t].m3 = 0; - _m[t].m4 = 0; - _m[t].m5 = TRANSPORT_ROAD << 2 | d; -} - -static inline void MakeRailTunnel(TileIndex t, Owner o, DiagDirection d, RailType r) -{ - SetTileType(t, MP_TUNNELBRIDGE); - SetTileOwner(t, o); - _m[t].m2 = 0; - _m[t].m3 = r; - _m[t].m4 = 0; - _m[t].m5 = TRANSPORT_RAIL << 2 | d; -} - -#endif /* TUNNEL_MAP_H */ |