(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.

1 files changed, 75 insertions, 0 deletions

diff --git a/src/tunnel_map.h b/src/tunnel_map.h
new file mode 100644
index 000000000..c9a3a36a3
--- /dev/null
+++ b/src/tunnel_map.h
@@ -0,0 +1,75 @@
+/* $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 */